From 544c6ee5673376d19547353ef0683d712d0856e9 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 7 Feb 2013 16:44:37 -0500 Subject: am335x-evm, omap3*: drop remaining TARGET_ARCH, wrecking sstate Bump MACHINE_KERNEL_PR to rebuild the correct sstate. Signed-off-by: Denys Dmytriyenko --- conf/machine/am335x-evm.conf | 1 - conf/machine/include/omap3.inc | 3 +-- conf/machine/include/ti33x.inc | 2 +- conf/machine/omap3-touchbook.conf | 3 --- conf/machine/omap3evm.conf | 2 -- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index e86c41b2..762f787c 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: AM335x EVM #@DESCRIPTION: Machine configuration for the TI AM335x EVM -TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8ce0ebc6..f038b0c7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r122" +MACHINE_KERNEL_PR = "r123" KERNEL_IMAGETYPE = "uImage" @@ -12,4 +12,3 @@ UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" EXTRA_IMAGEDEPENDS += "u-boot x-load" - diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 223f814d..713a30ae 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r16" +MACHINE_KERNEL_PR = "r17" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf index 95d93ac0..8439e0aa 100644 --- a/conf/machine/omap3-touchbook.conf +++ b/conf/machine/omap3-touchbook.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: Always Innovating touchbook #@DESCRIPTION: Machine configuration for the http://www.alwaysinnovating.com/touchbook/ -TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -43,7 +42,5 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" # UBI: sub-page size: 512 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" - - # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index 16caf05a..dfedf0fc 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: OMAP3 EVM #@DESCRIPTION: Machine configuration for the TI OMAP3 EVM -TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -49,4 +48,3 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" # UBI: physical eraseblock size: 131072 bytes (128 KiB) # UBI: sub-page size: 512 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" - -- cgit v1.2.3-54-g00ecf