diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-03-10 19:21:49 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-03-10 19:21:49 +0000 |
commit | 9b675de4fb39c23baf23f58b91f4d58e5aeae674 (patch) | |
tree | 76178421526399aefd72e140485ab620e2af9620 | |
parent | ed3a584c445dc6b68db8ce1ff246d64c16ea6fdb (diff) | |
parent | 36edc2f904a163ec02a3897a09c784a429396676 (diff) |
merge of '2e36446703200c483d26de29cbaa4a5269fbc5a6'
and '32536525315e3cb31c5dd980b055f0ecb13acead'
5 files changed, 25 insertions, 3 deletions
diff --git a/packages/uboot-utils/files/fic-gta01/.mtn2git_empty b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty diff --git a/packages/uboot-utils/files/fic-gta01/fw_env.config b/packages/uboot-utils/files/fic-gta01/fw_env.config new file mode 100644 index 0000000000..9fe07672c5 --- /dev/null +++ b/packages/uboot-utils/files/fic-gta01/fw_env.config @@ -0,0 +1,6 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd1 0x0000 0x4000 0x4000 diff --git a/packages/uboot-utils/files/turbostation/.mtn2git_empty b/packages/uboot-utils/files/turbostation/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot-utils/files/turbostation/.mtn2git_empty diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config new file mode 100644 index 0000000000..97ce8a87d4 --- /dev/null +++ b/packages/uboot-utils/files/turbostation/fw_env.config @@ -0,0 +1,15 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size + +# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, +# you should be *very* sure about what you're doing if you don't have a serial +# cable attached! +# /dev/mtd4 0x00000 0x20000 0x20000 + +# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily +# render your turbostation unbootable! + +/dev/mtd5 0x00000 0x20000 0x20000
\ No newline at end of file diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index 4786b238a9..292c97f134 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -3,12 +3,13 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" -PR = "2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.c.patch;patch=1 \ file://tools-Makefile.patch;patch=1 \ - file://env-Makefile.patch;patch=1 " + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" S = "${WORKDIR}/u-boot-${PV}" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" @@ -35,7 +36,7 @@ do_stage() { do_install () { install -d ${D}/sbin install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv - install -m 644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config } |