diff options
author | Denys Dmytriyenko <denys@ti.com> | 2013-03-05 16:28:30 -0500 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-03-08 16:17:11 -0500 |
commit | 7251d2309b9e691188dd2e66b6468923b1dcffec (patch) | |
tree | 2b7844baa31e6ecf9890ca3bf5a83123387b2639 /conf | |
parent | 0c5a45b423d66f7914dcdfe6bbdb35c954d465e4 (diff) | |
download | meta-ti-7251d2309b9e691188dd2e66b6468923b1dcffec.tar.gz |
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>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/omap4.inc | 2 | ||||
-rw-r--r-- | conf/machine/pandaboard.conf | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc index ecd23c40..6e909853 100644 --- a/conf/machine/include/omap4.inc +++ b/conf/machine/include/omap4.inc | |||
@@ -20,6 +20,8 @@ MACHINE_KERNEL_PR = "r1" | |||
20 | 20 | ||
21 | KERNEL_IMAGETYPE = "uImage" | 21 | KERNEL_IMAGETYPE = "uImage" |
22 | 22 | ||
23 | UBOOT_MACHINE = "omap4_panda_config" | ||
24 | |||
23 | UBOOT_ENTRYPOINT = "0x80008000" | 25 | UBOOT_ENTRYPOINT = "0x80008000" |
24 | UBOOT_LOADADDRESS = "0x80008000" | 26 | UBOOT_LOADADDRESS = "0x80008000" |
25 | 27 | ||
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 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/omap4.inc | 5 | require conf/machine/include/omap4.inc |
6 | 6 | ||
7 | UBOOT_MACHINE = "omap4_panda_config" | ||
8 | |||
9 | GUI_MACHINE_CLASS = "bigscreen" | 7 | GUI_MACHINE_CLASS = "bigscreen" |
10 | 8 | ||
11 | IMAGE_FSTYPES += "tar.bz2" | 9 | IMAGE_FSTYPES += "tar.bz2" |
@@ -13,6 +11,4 @@ IMAGE_FSTYPES += "tar.bz2" | |||
13 | SERIAL_CONSOLE = "115200 ttyO2" | 11 | SERIAL_CONSOLE = "115200 ttyO2" |
14 | 12 | ||
15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 13 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
16 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat sgx" | 14 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx" |
17 | |||
18 | |||