diff options
author | Denys Dmytriyenko <denys@ti.com> | 2013-02-07 16:44:37 -0500 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-02-12 14:48:05 -0500 |
commit | f054a7c14a3f0076b9b6c4c3116f847b7ffd3906 (patch) | |
tree | 55fbe3b138b0437e301fe97fe2b6cbfcebd2ca09 /conf | |
parent | 3eb71003af3ebb025285493721332111ac581a42 (diff) | |
download | meta-ti-f054a7c14a3f0076b9b6c4c3116f847b7ffd3906.tar.gz |
am335x-evm, omap3*: drop remaining TARGET_ARCH, wrecking sstate
Bump MACHINE_KERNEL_PR to rebuild the correct sstate.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/am335x-evm.conf | 1 | ||||
-rw-r--r-- | conf/machine/include/omap3.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/ti33x.inc | 2 | ||||
-rw-r--r-- | conf/machine/omap3-touchbook.conf | 3 | ||||
-rw-r--r-- | 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 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: AM335x EVM | 2 | #@NAME: AM335x EVM |
3 | #@DESCRIPTION: Machine configuration for the TI AM335x EVM | 3 | #@DESCRIPTION: Machine configuration for the TI AM335x EVM |
4 | TARGET_ARCH = "arm" | ||
5 | 4 | ||
6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
7 | XSERVER = "xserver-xorg \ | 6 | 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 | |||
4 | require conf/machine/include/tune-cortexa8.inc | 4 | require conf/machine/include/tune-cortexa8.inc |
5 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 5 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" |
6 | # Increase this everytime you change something in the kernel | 6 | # Increase this everytime you change something in the kernel |
7 | MACHINE_KERNEL_PR = "r122" | 7 | MACHINE_KERNEL_PR = "r123" |
8 | 8 | ||
9 | KERNEL_IMAGETYPE = "uImage" | 9 | KERNEL_IMAGETYPE = "uImage" |
10 | 10 | ||
@@ -12,4 +12,3 @@ UBOOT_ENTRYPOINT = "0x80008000" | |||
12 | UBOOT_LOADADDRESS = "0x80008000" | 12 | UBOOT_LOADADDRESS = "0x80008000" |
13 | 13 | ||
14 | EXTRA_IMAGEDEPENDS += "u-boot x-load" | 14 | EXTRA_IMAGEDEPENDS += "u-boot x-load" |
15 | |||
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 | |||
4 | require conf/machine/include/tune-cortexa8.inc | 4 | require conf/machine/include/tune-cortexa8.inc |
5 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" | 5 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" |
6 | # Increase this everytime you change something in the kernel | 6 | # Increase this everytime you change something in the kernel |
7 | MACHINE_KERNEL_PR = "r16" | 7 | MACHINE_KERNEL_PR = "r17" |
8 | 8 | ||
9 | KERNEL_IMAGETYPE = "uImage" | 9 | KERNEL_IMAGETYPE = "uImage" |
10 | 10 | ||
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 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: Always Innovating touchbook | 2 | #@NAME: Always Innovating touchbook |
3 | #@DESCRIPTION: Machine configuration for the http://www.alwaysinnovating.com/touchbook/ | 3 | #@DESCRIPTION: Machine configuration for the http://www.alwaysinnovating.com/touchbook/ |
4 | TARGET_ARCH = "arm" | ||
5 | 4 | ||
6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
7 | XSERVER = "xserver-xorg \ | 6 | XSERVER = "xserver-xorg \ |
@@ -43,7 +42,5 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" | |||
43 | # UBI: sub-page size: 512 | 42 | # UBI: sub-page size: 512 |
44 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" | 43 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" |
45 | 44 | ||
46 | |||
47 | |||
48 | # and sdio | 45 | # and sdio |
49 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" | 46 | 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 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: OMAP3 EVM | 2 | #@NAME: OMAP3 EVM |
3 | #@DESCRIPTION: Machine configuration for the TI OMAP3 EVM | 3 | #@DESCRIPTION: Machine configuration for the TI OMAP3 EVM |
4 | TARGET_ARCH = "arm" | ||
5 | 4 | ||
6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
7 | XSERVER = "xserver-xorg \ | 6 | XSERVER = "xserver-xorg \ |
@@ -49,4 +48,3 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" | |||
49 | # UBI: physical eraseblock size: 131072 bytes (128 KiB) | 48 | # UBI: physical eraseblock size: 131072 bytes (128 KiB) |
50 | # UBI: sub-page size: 512 | 49 | # UBI: sub-page size: 512 |
51 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" | 50 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" |
52 | |||