From 4c7413253080f4e5eaf1d293c248f3949efe9e68 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 5 Mar 2013 16:29:17 -0500 Subject: [PATCH] keystone: unify and cleanup configs * Centralize common/SoC settings in keystone.inc SOC_FAMILY config. * Set/override uncommon specifics in machine configs. Signed-off-by: Denys Dmytriyenko --- conf/machine/include/keystone.inc | 4 ++++ conf/machine/keystone-evm.conf | 13 ------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc index bd447d49..047cc185 100644 --- a/conf/machine/include/keystone.inc +++ b/conf/machine/include/keystone.inc @@ -11,8 +11,12 @@ MACHINE_KERNEL_PR = "r5" KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "tci6638_evm_config" + UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" EXTRA_IMAGEDEPENDS += "u-boot" EXTRA_IMAGEDEPENDS += "boot-monitor" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat" diff --git a/conf/machine/keystone-evm.conf b/conf/machine/keystone-evm.conf index 13df843f..a2c05f85 100644 --- a/conf/machine/keystone-evm.conf +++ b/conf/machine/keystone-evm.conf @@ -2,17 +2,7 @@ #@NAME: Keystone 2 machine #@DESCRIPTION: Machine configuration for the TI Keystone 2 -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-video-fbdev" - -GUI_MACHINE_CLASS = "bigscreen" - require conf/machine/include/keystone.inc -#EXTRA_IMAGEDEPENDS = "u-boot" - -PREFERRED_PROVIDER_virtual/kernel = "linux-keystone" IMAGE_FSTYPES += "ubi tar.bz2 cpio" @@ -20,9 +10,6 @@ SERIAL_CONSOLE = "115200 ttyS0" SYSVINIT_ENABLED_GETTYS = "" -UBOOT_MACHINE = "tci6638_evm_config" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" # do ubiattach /dev/ubi_ctrl -m 4 # From dmesg: # UBI: smallest flash I/O unit: 2048