diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-08-29 09:16:46 +0200 |
|---|---|---|
| committer | Jan Luebbe <jlu@pengutronix.de> | 2012-08-29 11:54:10 +0200 |
| commit | 6c45f7011f57fed178b4703ce6c2d74bf954427b (patch) | |
| tree | e128a54df386a92e77be8e4c3a1f67b7e0c94458 | |
| parent | 1d43feeeedb0ef010fb646254448869c38d78432 (diff) | |
| download | platform-pengutronix-raspberrypi-6c45f7011f57fed178b4703ce6c2d74bf954427b.tar.gz platform-pengutronix-raspberrypi-6c45f7011f57fed178b4703ce6c2d74bf954427b.tar.xz | |
firmware: update and make start.elf configurable
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
| -rw-r--r-- | config/images/boot-vfat.config | 1 | ||||
| -rw-r--r-- | firmware/arm128_start.elf | bin | 2047400 -> 2459664 bytes | |||
| -rw-r--r-- | firmware/arm192_start.elf | bin | 2047400 -> 2459664 bytes | |||
| -rw-r--r-- | firmware/arm224_start.elf | bin | 2047400 -> 2459664 bytes | |||
| -rw-r--r-- | firmware/arm240_start.elf | bin | 0 -> 632784 bytes | |||
| -rw-r--r-- | firmware/bootcode.bin | bin | 16528 -> 16536 bytes | |||
| -rw-r--r-- | firmware/loader.bin | bin | 272459 -> 275235 bytes | |||
| -rw-r--r-- | firmware/start.elf | bin | 2047400 -> 0 bytes | |||
| -rw-r--r-- | platforms/image-boot-vfat.in | 32 | ||||
| -rw-r--r-- | rules/image-boot-vfat.make | 3 |
10 files changed, 35 insertions, 1 deletions
diff --git a/config/images/boot-vfat.config b/config/images/boot-vfat.config index 4861fb6..35b62d8 100644 --- a/config/images/boot-vfat.config +++ b/config/images/boot-vfat.config @@ -4,6 +4,7 @@ include("kernel.config") image @IMAGE@ { vfat { files = { @FILES@, kernel.img } + file start.elf { image = "@START@" } } name = boot-vfat size = 16M diff --git a/firmware/arm128_start.elf b/firmware/arm128_start.elf Binary files differindex 22c13a8..e52bbd9 100644 --- a/firmware/arm128_start.elf +++ b/firmware/arm128_start.elf diff --git a/firmware/arm192_start.elf b/firmware/arm192_start.elf Binary files differindex a550462..c6d6de7 100644 --- a/firmware/arm192_start.elf +++ b/firmware/arm192_start.elf diff --git a/firmware/arm224_start.elf b/firmware/arm224_start.elf Binary files differindex 7beeb63..4857916 100644 --- a/firmware/arm224_start.elf +++ b/firmware/arm224_start.elf diff --git a/firmware/arm240_start.elf b/firmware/arm240_start.elf Binary files differnew file mode 100644 index 0000000..eb1999d --- /dev/null +++ b/firmware/arm240_start.elf diff --git a/firmware/bootcode.bin b/firmware/bootcode.bin Binary files differindex 209d119..d6bbd12 100644 --- a/firmware/bootcode.bin +++ b/firmware/bootcode.bin diff --git a/firmware/loader.bin b/firmware/loader.bin Binary files differindex eeac680..fcda3bb 100644 --- a/firmware/loader.bin +++ b/firmware/loader.bin diff --git a/firmware/start.elf b/firmware/start.elf Binary files differdeleted file mode 100644 index 22c13a8..0000000 --- a/firmware/start.elf +++ /dev/null diff --git a/platforms/image-boot-vfat.in b/platforms/image-boot-vfat.in index 68052c7..492311f 100644 --- a/platforms/image-boot-vfat.in +++ b/platforms/image-boot-vfat.in @@ -8,3 +8,35 @@ config IMAGE_BOOT_VFAT prompt "Generate image/boot.vfat" help FIXME + +if IMAGE_BOOT_VFAT + +choice + prompt "startup configuration" + default IMAGE_BOOT_VFAT_START_224 + + config IMAGE_BOOT_VFAT_START_128 + bool + prompt "arm128_start.elf" + + config IMAGE_BOOT_VFAT_START_192 + bool + prompt "arm192_start.elf" + + config IMAGE_BOOT_VFAT_START_224 + bool + prompt "arm224_start.elf" + + config IMAGE_BOOT_VFAT_START_240 + bool + prompt "arm240_start.elf" +endchoice + +config IMAGE_BOOT_VFAT_START + string + default "arm128" if IMAGE_BOOT_VFAT_START_128 + default "arm192" if IMAGE_BOOT_VFAT_START_192 + default "arm224" if IMAGE_BOOT_VFAT_START_224 + default "arm240" if IMAGE_BOOT_VFAT_START_240 + +endif diff --git a/rules/image-boot-vfat.make b/rules/image-boot-vfat.make index d7fa980..a64095b 100644 --- a/rules/image-boot-vfat.make +++ b/rules/image-boot-vfat.make @@ -38,7 +38,8 @@ endef IMAGE_BOOT_VFAT_ENV := \ FILES="$(call squote_and_comma,$(IMAGE_BOOT_VFAT_DATA))" \ HEADER=$(PTXDIST_PLATFORMCONFIGDIR)/first32k.bin \ - KERNEL=linuximage + KERNEL=linuximage \ + START=$(PTXDIST_PLATFORMCONFIGDIR)/firmware/$(PTXCONF_IMAGE_BOOT_VFAT_START)_start.elf $(IMAGE_BOOT_VFAT_IMAGE): @$(call targetinfo) |