omap4, pandaboard: unify and cleanup configs

* Centralize common/SoC settings in omap4.inc SOC_FAMILY config.
* Set/override uncommon specifics in machine configs.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index 5ee5f9db..cf71be10 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -17,6 +17,8 @@ MACHINE_KERNEL_PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_MACHINE = "omap4_panda_config"
+
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf
index 3ebd6d93..b3d0399d 100644
--- a/conf/machine/pandaboard.conf
+++ b/conf/machine/pandaboard.conf
@@ -4,8 +4,6 @@
 
 require conf/machine/include/omap4.inc
 
-UBOOT_MACHINE = "omap4_panda_config"
-
 GUI_MACHINE_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.bz2"
@@ -13,6 +11,4 @@ IMAGE_FSTYPES += "tar.bz2"
 SERIAL_CONSOLE = "115200 ttyO2"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat sgx"
-
-
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"