Skip to content

Commit

Permalink
conf: Clean up unneeded configurations and typos
Browse files Browse the repository at this point in the history
Notable:
 * remove MACHINE_KERNEL_PR: unused
 * remove GUMSTIX_WIFI_IFACE: relevant in meta-gumstix-extras, not here

Signed-off-by: Ash Charles <ashcharles@gmail.com>
  • Loading branch information
ashcharles committed Feb 13, 2015
1 parent 36fb982 commit 7e91ae6
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@ Yocto BSP layer for Gumstix products.
This layer depends on:

URI: git://git.yoctoproject.org/poky.git
branch: master
branch: dizzy
revision: HEAD

Layer maintainer: Adam Lee <adam@gumstix.com> for Gumstix, Inc.
2 changes: 1 addition & 1 deletion conf/local.conf.sample
Expand Up @@ -57,7 +57,7 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
#MACHINE ?= "mpc8315e-rdb"
#MACHINE ?= "routerstationpro"
#
# This sets the default machine to be qemux86 if no other machine is selected:
# This sets the default machine to be overo if no other machine is selected:
MACHINE ?= "overo"
#MACHINE ?= "pepper"
#MACHINE ?= "duovero"
Expand Down
5 changes: 0 additions & 5 deletions conf/machine/duovero.conf
Expand Up @@ -14,8 +14,6 @@ require conf/machine/include/tune-cortexa8.inc

# Specify kernel recipe
PREFERRED_PROVIDER_virtual/kernel ?= "linux-gumstix"
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r0"

# Specify u-boot parameters
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
Expand Down Expand Up @@ -43,9 +41,6 @@ IMAGE_FSTYPES ?= "tar.bz2"
# Include wifi firmware
MACHINE_EXTRA_RDEPENDS += "linux-firmware-sd8787 linux-firmware-wl18xx"

# Define wifi interface
GUMSTIX_WIFI_IFACE = "mlan0"

# Ship all kernel modules by default
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_FEATURES = "alsa bluetooth ext2 keyboard serial touchscreen usbgadget usbhost vfat wifi"
7 changes: 1 addition & 6 deletions conf/machine/overo.conf
Expand Up @@ -12,8 +12,6 @@ require conf/machine/include/tune-cortexa8.inc

# Specify kernel recipe
PREFERRED_PROVIDER_virtual/kernel ?= "linux-gumstix"
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r1"

# Specify u-boot parameters
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
Expand All @@ -23,7 +21,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
UBOOT_MACHINE = "omap3_overo_config"

EXTRA_IMAGEDEPENDS += " u-boot"
EXTRA_IMAGEDEPENDS += "u-boot"

# Specify xserver components for builds including X11
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
Expand Down Expand Up @@ -56,9 +54,6 @@ UBI_VOLNAME = "rootfs"
# Include wifi firmware
MACHINE_EXTRA_RDEPENDS += "linux-firmware-sd8686 linux-firmware-sd8787 linux-firmware-wl18xx"

# Define wifi interface
GUMSTIX_WIFI_IFACE = "wlan0"

# Ship all kernel modules by default
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules omap3-pwm u-boot-fw-utils"
MACHINE_FEATURES = "alsa bluetooth ext2 keyboard serial touchscreen usbgadget usbhost vfat wifi"
Expand Down
7 changes: 1 addition & 6 deletions conf/machine/pepper.conf
Expand Up @@ -12,8 +12,6 @@ require conf/machine/include/tune-cortexa8.inc

# Specify kernel recipe
PREFERRED_PROVIDER_virtual/kernel ?= "linux-gumstix"
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r1"

# Specify u-boot parameters
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
Expand All @@ -23,7 +21,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
UBOOT_MACHINE = "pepper_config"

EXTRA_IMAGEDEPENDS += " u-boot"
EXTRA_IMAGEDEPENDS += "u-boot"

# Default to LCD.
GUI_MACHINE_CLASS ?= "smallscreen"
Expand All @@ -42,9 +40,6 @@ IMAGE_FSTYPES ?= "tar.bz2"
# Include wifi firmware
MACHINE_EXTRA_RDEPENDS += "linux-firmware-sd8787 linux-firmware-wl18xx"

# Define wifi interface
GUMSTIX_WIFI_IFACE = "mlan0"

# Ship all kernel modules by default
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_FEATURES = "alsa bluetooth ext2 keyboard serial touchscreen usbgadget usbhost vfat wifi"

0 comments on commit 7e91ae6

Please sign in to comment.