[oe-commits] org.oe.oz354x c7x0/akita/spitz.conf: set to 2.6 kernel (not overridable)

[hrw commit]

c7x0/akita/spitz.conf: set to 2.6 kernel (not overridable)

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 1448a395b94164bbe414b04dbcce8b9cae8326ba
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1448a395b94164bbe414b04dbcce8b9cae8326ba
Files:
1
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/spitz.conf
Diffs:

#
# mt diff -r408c253d888c3f899abf27c5a3d7de9076ffa40a -r1448a395b94164bbe414b04dbcce8b9cae8326ba
#
# 
# 
# patch "conf/machine/akita.conf"
#  from [4fae7bb7452110eb5944657235f6578293425b1e]
#    to [569ab2629c61924e4cc7eb834f6fa5dcb620d7f7]
# 
# patch "conf/machine/c7x0.conf"
#  from [7e4bfe5d75a97d3438bd44a2eda9a4e6f09af371]
#    to [97beb6336a1cc616669478350c718fcb231645fe]
# 
# patch "conf/machine/spitz.conf"
#  from [cbc6c75c91ff242be18466505f94d6eedece3cc8]
#    to [045f9d670b5ce14bb7657bbceb6f8db04b8113bf]
# 
============================================================
--- conf/machine/akita.conf	4fae7bb7452110eb5944657235f6578293425b1e
+++ conf/machine/akita.conf	569ab2629c61924e4cc7eb834f6fa5dcb620d7f7
@@ -1,10 +1,10 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-ZKERNEL_VERSION ?= "2.6"
+ZKERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 ROOT_FLASH_SIZE = "64"
============================================================
--- conf/machine/c7x0.conf	7e4bfe5d75a97d3438bd44a2eda9a4e6f09af371
+++ conf/machine/c7x0.conf	97beb6336a1cc616669478350c718fcb231645fe
@@ -1,11 +1,11 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-ZKERNEL_VERSION ?= "2.6"
+ZKERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 ROOT_FLASH_SIZE = "32"
 # yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
============================================================
--- conf/machine/spitz.conf	cbc6c75c91ff242be18466505f94d6eedece3cc8
+++ conf/machine/spitz.conf	045f9d670b5ce14bb7657bbceb6f8db04b8113bf
@@ -1,11 +1,11 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-ZKERNEL_VERSION ?= "2.6"
+ZKERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"