- the fixup patches for NSLU2 and NAS100D have been slightly simplified.
the fixup for Loft has been removed, it isn't useful.
code in arch/arm/kernel/setup.c to automagically swap the command line
has been added in 48-setup-byteswap-cmdline.patch
# override in local.conf etc
CMDLINE_DEBUG ?= ""
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
+CMDLINE = "${CMDLINE_ROOT}"
+CMDLINE += "${CMDLINE_DEBUG}"
+CMDLINE += "${CMDLINE_CONSOLE}"
# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
# required. Notice that this has to be done for each separately built
# MACHINE DEFINITIONS: one block for each machine
# The correct settings for the NSLU2 board:
-nslu2_CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M init=/linuxrc"
nslu2_MACHID = "597"
PACKAGES += "kernel-image-nslu2"
PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}"
PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${ARCH_BYTE_SEX}"
-DESCRIPTION_kernel-image-nas100d = "Linux kernel for the LinkSys NSLU2"
-FILES_kernel-image-nslu2 = "/boot/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2"
+FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+pkg_postinst_kernel-image-nslu2 () {
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+}
+pkg_postrm_kernel-image-nslu2 () {
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+}
# The correct settings for Loft:
-loft_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc"
loft_MACHID = "849"
PACKAGES += "kernel-image-loft"
PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}"
PACKAGE_ARCH_kernel-image-loft = "loft${ARCH_BYTE_SEX}"
DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board"
-FILES_kernel-image-loft = "/boot/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+pkg_postinst_kernel-image-loft () {
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+}
+pkg_postrm_kernel-image-loft () {
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+}
# The correct settings for the NAS100D board:
-nas100d_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc"
nas100d_MACHID = "865"
PACKAGES += "kernel-image-nas100d"
PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}"
PACKAGE_ARCH_kernel-image-nas100d = "nas100d${ARCH_BYTE_SEX}"
DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D"
-FILES_kernel-image-nas100d = "/boot/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+pkg_postinst_kernel-image-nas100d () {
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+}
+pkg_postrm_kernel-image-nas100d () {
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+}
#FIXUP: the correct instructions to copy the kernel prepended with the le fixup
#FIXME: do a fixup for BE too...
DEPENDS += "devio-native"
+# We need the alternatives to happen in the kernel-image packages, not in
+# the kernel package, because only the images know the name of the kernel.
+pkg_postinst_kernel () {
+}
+pkg_postrm_kernel () {
+}
+
# copy_image <dest> <cmdline> <machine-id>
# copy the zImage and append the appropriate shim
# dest: where to copy to
# cmdline: command line to pass to image
# machine-id: decimal machine id to prepend, empty for none
copy_image() {
- local cmdline setmach
-
- cmdline=""
- test -n "$2" && cmdline="$2"' ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}'
+ local setmach
setmach=""
- test -n "$3" && setmach="wb $3 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
+ test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
rm -f "$1".new
devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || {
}
install_image() {
- copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2" "$3"
+ copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2"
}
do_install_append() {
install_image '${IXP4XX_SUFFIX}'
# Add the machine specific images, with appropriate suffixes
- install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}'
- install_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}'
- install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}'
+ install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}'
+ install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}'
+ install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}'
}
do_deploy[dirs] = "${S}"
deploy_image() {
- copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2" "$3"
+ copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2"
}
do_deploy() {
deploy_image '${IXP4XX_SUFFIX}'
# And the machine specific images
- deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}'
- deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}'
- deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}'
+ deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}'
+ deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}'
+ deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}'
}
addtask deploy before do_build after do_compile
--- /dev/null
+When invoking an LE kernel from a BE boot loader or vice versa
+the ATAG_CMDLINE command line will be byte swapped, other ATAGs
+are fine because they are 32 bit values.
+
+This patch adds support for a command line option "swx " - which
+must be at the start of the command line - and which is used to
+detect a need to byte swap the rest of the command line.
+
+Signed-off-by: John Bowler <jbowler@acm.org>
+
+--- linux-2.6.15/arch/arm/kernel/setup.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/arch/arm/kernel/setup.c 1970-01-01 00:00:00.000000000 +0000
+@@ -659,7 +659,34 @@ __tagtable(ATAG_REVISION, parse_tag_revi
+
+ static int __init parse_tag_cmdline(const struct tag *tag)
+ {
+- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
++ /* Check the first four bytes for "swx " (swap, but it's
++ * ok) or " xws" (command line is byte swapped)
++ */
++ const char *cmdline = tag->u.cmdline.cmdline;
++ u32 size = tag->hdr.size;
++
++ if (size > 0 && !memcmp(cmdline, " xws", 4)) {
++ cmdline += 4;
++
++ if (--size > 0) {
++ const u32 *from = (const u32*)cmdline;
++ u32 *to = (u32*)default_command_line;
++
++ if (size > COMMAND_LINE_SIZE/4)
++ size = COMMAND_LINE_SIZE/4;
++
++ while (size-- > 0)
++ to[size] = swab32(from[size]);
++
++ default_command_line[COMMAND_LINE_SIZE-1] = 0;
++ return 0;
++ }
++ }
++
++ if (size > 0 && !memcmp(cmdline, "swx ", 4))
++ cmdline += 4;
++
++ strlcpy(default_command_line, cmdline, COMMAND_LINE_SIZE);
+ return 0;
+ }
+
+++ /dev/null
-Include a fixup machine start function in the loft part of
-ixdp425-setup.c to handle the command line and memory setup
-parameters which are not specifiable in the boot loader.
-
-Signed-off-by: John Bowler <jbowler@acm.org>
-
-
---- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000
-@@ -191,8 +191,8 @@ MACHINE_END
- /*
- * Loft is functionally equivalent to Avila except that it has a
- * different number for the maximum PCI devices. The MACHINE
-- * structure below is identical to Avila except for the and
-- * the use of a loft specific init.
-+ * structure below is derived from the Avila one (and may, in
-+ * fact, be useful on Avila in general).
- *
- * The loft init registers a notifier on the on-board EEPROM to
- * detect the MAC addresses.
-@@ -201,6 +201,58 @@ MACHINE_END
- */
- #ifdef CONFIG_MACH_LOFT
- /*
-+ * Loft bootstrap may pass in parameters, if these contain an
-+ * ATAG_MEM and it appears valid (not the 16MByte one in the
-+ * setup/kernel.c default) we use it, otherwise a 64MByte
-+ * setting is forced here, this may be overridden on the
-+ * command line.
-+ */
-+static void __init loft_fixup(struct machine_desc *desc,
-+ struct tag *tags, char **cmdline, struct meminfo *mi)
-+{
-+ char saved_command_line[COMMAND_LINE_SIZE];
-+ /* Put Loft specific known-required-for-certain stuff here, leave
-+ * a trailing space!
-+ */
-+ static char loft_command_line[] =
-+ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc "
-+ "rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 ";
-+ const int len = (sizeof loft_command_line)-1;
-+ int memtag = 0;
-+
-+ /* The Loft typically has one bank of 64MByte memory.
-+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove
-+ * the mem tags from the tag list, so if there is an entry
-+ * there don't remove it!
-+ */
-+ if (tags->hdr.tag == ATAG_CORE) do {
-+ tags = tag_next(tags);
-+ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size);
-+ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) &&
-+ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) {
-+ memtag = 1;
-+ printk(KERN_NOTICE " ATAG_MEM base %lx size %lx\n",
-+ tags->u.mem.start, tags->u.mem.size);
-+ }
-+ } while (tags->hdr.size);
-+
-+ if (!memtag) {
-+ mi->nr_banks=1;
-+ mi->bank[0].start = 0;
-+ mi->bank[0].size = (64*1024*1024);
-+ mi->bank[0].node = PHYS_TO_NID(0);
-+ }
-+
-+ /* A command line in the ATAG list will override this one,
-+ * as is intended.
-+ */
-+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE);
-+ memcpy(*cmdline, loft_command_line, len);
-+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len);
-+ *cmdline[COMMAND_LINE_SIZE-1] = 0;
-+}
-+
-+/*
- * When the EEPROM is added the MAC address are read from it.
- */
- static void loft_eeprom_add(int address, int kind, struct kobject *kobj,
-@@ -252,6 +304,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc
- .phys_ram = PHYS_OFFSET,
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-+ .fixup = loft_fixup,
- .map_io = ixp4xx_map_io,
- .init_irq = ixp4xx_init_irq,
- .timer = &ixp4xx_timer,
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -164,12 +166,49 @@ static void __init nas100d_init(void)
+@@ -164,12 +166,53 @@ static void __init nas100d_init(void)
platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
}
+ * settings to be safe (the box always has 64MByte at 0). The
+ * passed in command line can override this default, we prepend
+ * to the config'ed default.
++ *
++ * NOTE: the startup sequence is:
++ * 1) Call the machine fixup
++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in
++ * to default_command_line which is the value of *from
++ * 3) Parse the command line in *from (*not*
++ * default_command_line unless they are the same!)
++ *
++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE)
++ * any ATAG_MEM tags, but mem= command line options cause nr_banks
++ * to be reset to 0 (on the first mem=)
+ */
++static char nas100d_command_line[] __initdata =
++ "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc "
++ "pcf8563.hctosys=1 "
++ CONFIG_CMDLINE;
++
+static void __init nas100d_fixup(struct machine_desc *desc,
+ struct tag *tags, char **cmdline, struct meminfo *mi)
+{
-+ char saved_command_line[COMMAND_LINE_SIZE];
-+ /* Put NAS100D specific known-required-for-certain stuff here, leave
-+ * a trailing space!
-+ */
-+ static char nas100d_command_line[] =
-+ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc "
-+ "pcf8563.hctosys=1 ";
-+ const int len = (sizeof nas100d_command_line)-1;
-+
-+ /* The NAS100D has one bank of 32MByte memory.
++ /* The NAS100D has one bank of 64MByte memory.
+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove
+ * the mem tags from the tag list. We need do nothing here!
+ */
+ /* A command line in the ATAG list will override this one,
+ * as is intended.
+ */
-+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE);
-+ memcpy(*cmdline, nas100d_command_line, len);
-+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len);
-+ *cmdline[COMMAND_LINE_SIZE-1] = 0;
++ strlcpy(*cmdline, nas100d_command_line, COMMAND_LINE_SIZE);
+}
+
MACHINE_START(NAS100D, "Iomega NAS 100d")
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -165,12 +167,52 @@ static void __init nslu2_init(void)
+@@ -165,12 +167,53 @@ static void __init nslu2_init(void)
platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
}
+/*
-+ * NSLU2 RedBoot passes garbage atag/parameter values - i.e. r2
-+ * on entry is not useable - so we get to set the right values
-+ * here...
++ * NSLU2 RedBoot passes garbage atag/parameter values because it copies
++ * the kernel zImage on top of the parameter list before branching into
++ * the zImage. The machine description causes the ATAG list to be
++ * skipped (by setting boot_params to 0) and this code fixes up the
++ * memory info and command line by supplying a command line with the
++ * NSLU2 specific config prepended.
++ *
++ * NOTE: the startup sequence is:
++ * 1) Call the machine fixup
++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in
++ * to default_command_line which is the value of *from
++ * 3) Parse the command line in *from (*not*
++ * default_command_line unless they are the same!)
++ *
++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE)
++ * any ATAG_MEM tags, but mem= command line options cause nr_banks
++ * to be reset to 0 (on the first mem=)
+ */
++static char nslu2_command_line[] __initdata =
++ "root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc "
++ "rtc-x1205.probe=0,0x6f rtc-x1205.hctosys=1 "
++ CONFIG_CMDLINE;
++
+static void __init nslu2_fixup(struct machine_desc *desc,
+ struct tag *tags, char **cmdline, struct meminfo *mi)
+{
-+ char saved_command_line[COMMAND_LINE_SIZE];
-+ /* Put NSLU2 specific known-required-for-certain stuff here, leave
-+ * a trailing space!
-+ */
-+ static char nslu2_command_line[] =
-+ "root=/dev/mtdblock4 rw rootfstype=jffs2 init=/linuxrc "
-+ "rtc-x1205.probe=0,0x6f rtc-x1205.hctosys=1 ";
-+ const int len = (sizeof nslu2_command_line)-1;
-+
+ /* The NSLU2 has one bank of 32MByte memory.
-+ * NOTE: this will totally destroy attempts to make fatslugs work,
-+ * FATSLUG FATSLUG FATSLUG: please parameterise this!
-+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove
-+ * the mem tags from the tag list. We need do nothing here!
++ * NOTE: to make a 'fatslug' work append the appropriate
++ * mem= to the CONFIG_CMDLINE - this will override the
++ * setting below.
+ */
+ mi->nr_banks=1;
+ mi->bank[0].start = 0;
+ mi->bank[0].size = (32*1024*1024);
+ mi->bank[0].node = PHYS_TO_NID(0);
+
-+ /* The tag list is the one from kernel/setup.c, it has no
-+ * command line, so we are free to make one up, do this by
-+ * prepending to the default command line which has been
-+ * passed in (so that can override if necessary).
-+ */
-+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE);
-+ memcpy(*cmdline, nslu2_command_line, len);
-+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len);
-+ *cmdline[COMMAND_LINE_SIZE-1] = 0;
++ strlcpy(*cmdline, nslu2_command_line, COMMAND_LINE_SIZE);
+}
+
MACHINE_START(NSLU2, "Linksys NSLU2")
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
- .boot_params = 0x00000100,
-+ .boot_params = 0, /* because they are garbage */
++ .boot_params = 0, /* because they are garbage - see above */
+ .fixup = nslu2_fixup,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r8.${PR_CONFIG}"
+PR = "r9.${PR_CONFIG}"
include ixp4xx-kernel.inc
IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1"
IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1"
IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1"
+IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1"
IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1"
IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1"
IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1"
IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1"
IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1"
IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1"
-IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1"
IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1"
IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1"
git.openpandora.org / openembedded.git / commitdiff