diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-01-24 10:24:05 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-01-24 10:24:05 +0000 |
| commit | e4e79dc599387fd145e5aaeb01cc0c3a75f1ef5b (patch) | |
| tree | f9684cf614c809f53a296b2d887ebd4ddbbdac1f | |
| parent | ee8a417ab7a395332a1db94106edd7c97119a2ef (diff) | |
| parent | fd606e8b6a5f1431a564bbdc256deea79696b9bd (diff) | |
merge of '030aef29634d93900fd18913a7e81812e016f259'
and 'b5cdc069a6b5339a010e9871667c5a374b5c96cf'
| -rw-r--r-- | conf/machine/at32stk1000.conf | 1 | ||||
| -rw-r--r-- | conf/machine/atngw100.conf | 1 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.23.bb | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index ac63af5e56..4c3112df78 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -23,5 +23,4 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.1.4" -ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* || true;" diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 17b4c4187a..21e256b04a 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -22,4 +22,3 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" PREFERRED_VERSION_u-boot = "1.1.4" KERNEL_IMAGETYPE = "uImage" -ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* || true ;" diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index d8a6d1346a..77137b0d9a 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -29,9 +29,11 @@ SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squ # Completely fair scheduler SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1" -SRC_URI_append_avr32 = " \ - http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \ - " +# The Atmel patch doesn't apply against 2.6.23.12 :( +SRC_URI_avr32 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ + file://defconfig \ + http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \ + " SRC_URI_append_cm-x270 = "\ file://0001-cm-x270-base2.patch;patch=1 \ |