Pull request for branch bootloaders-cleanup
Subsystems (2)
Hello,
Here is my first set of cleanup patches for 2010.08. This set tries to cleanup the bootloader compilation code.
In short:
* Move bootloader code from target/ to boot/ (new directory)
* Add support for the Barebox bootloader
* Simplify how U-Boot is handled, with less configuration options
* Drop support for Yaboot
* Bump syslinux and fix various build issues
* Cleanup everywhere
* Mark grub2 as BROKEN: it wasn't working, it still doesn't build properly.
The following configurations do work for me :
* U-Boot ARM at91sam9263ek + AT91bootstrap for the same board
* Barebox ARM at91sam9263ek
* Grub x86
* Syslinux x86
* Pxelinux x86
* Barebox PowerPC pcm030
* U-Boot PowerPC barco
As usual, there are certainly remaining issues, and possible further cleanups. Don't hesitate to let me know about your ideas.
Cheers,
Thomas
The following changes since commit e1a7d916e9eeaa215551740de40c055130d6c073:
Peter Korsgaard (1):
Revert "Add -rpath option for host package compilation"
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot bootloaders-cleanup
Thomas Petazzoni (46):
bootloaders: move bootloader build code to boot/
yaboot: drop support
boot: remove references to COPYTO
u-boot: do not default to $(BOARD_NAME) for the board name
u-boot: remove ancient versions
u-boot: rename Makefile.in to u-boot.mk for coherency
u-boot: remove option to configure download site
u-boot: remove arch specific patches infrastructure
u-boot: remove u-boot-status make target
u-boot: remove reference to old 1.2.0-atmel version
u-boot: simplify custom patch handling
u-boot: remove patch for obsolete version
u-boot: remove useless symbolic link
u-boot: support building for mkimage
u-boot: further simplify the configuration
u-boot: remove unused U_BOOT_TARGET_TOOLS variable
u-boot: add a few comments
u-boot: remove unneeded symbolic link + blank line
grub: remove GRUB_SUPPORTED_ARCH
grub2: remove GRUB2_ARCH_SUPPORTED
grub/grub2: drop unnecessary dependency on uclibc
grub/grub2: update splash image location
grub2: bump version
grub2: fix build
grub2: remove non-existing options
grub2: only available on x86 and PowerPC and mark as BROKEN
syslinux: bump version and fix build
syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check
nasm: new package, needed for syslinux
syslinux: depends on host-nasm
at91bootstrap: do not default to $(BOARD_NAME)
at91bootstrap: simplify configuration
at91bootstrap: fix the boot source selection
at91bootstrap: fix incorrect config option comment
at91bootstrap: remove unused/useless code
at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set
at91bootstrap: bump version to 2.13
at91bootstrap: don't use the ATMEL_MIRROR thing
at91bootstrap: fix install procedure
at91bootstrap: fix AT91BOOTSTRAP_BINARY
at91dataflashboot: fix configuration options
at91dataflashboot: various fixes
at91dataflashboot: add a patch step
at91dataflashboot: add two patches
defconfigs: remove references to old U-Boot versions
Add support for the Barebox bootloader
Config.in | 2 +
Makefile | 3 +-
boot/Config.in | 12 +
.../device/Atmel => boot}/at91bootstrap/Config.in | 26 +-
.../Atmel => boot}/at91bootstrap/at91bootstrap.mk | 47 +-
.../at91dataflashboot}/Config.in | 16 +-
.../at91dataflashboot-1.05-do-not-install.patch | 22 +
.../at91dataflashboot-1.05-eabi-fixes.patch | 43 +
.../at91dataflashboot/at91dataflashboot.mk | 23 +-
boot/barebox/Config.in | 14 +
boot/barebox/barebox.mk | 61 ++
boot/common.mk | 1 +
{target/x86 => boot}/grub/Config.in | 0
.../x86 => boot}/grub/grub.100-autoreconf.patch | 0
.../grub/grub.200-fix_mbr_handling.patch | 0
.../grub/grub.300-honor_UCLIBC_HAS_LFS.patch | 0
.../grub/grub.400-nic_update2.patch.bz2 | Bin 328903 -> 328903 bytes
{target/x86 => boot}/grub/grub.mk | 25 +-
{target/x86 => boot}/grub/menu.lst | 0
{target/x86 => boot}/grub/splash.xpm.gz | Bin 45185 -> 45185 bytes
boot/grub2/Config.in | 9 +
boot/grub2/grub2.mk | 93 +++
{target/x86 => boot}/syslinux/Config.in | 0
boot/syslinux/syslinux-3.85-makefile.patch | 17 +
boot/syslinux/syslinux.mk | 54 ++
boot/u-boot/Config.in | 101 +++
boot/u-boot/u-boot.mk | 188 +++++
configs/at91rm9200df_defconfig | 2 -
configs/at91rm9200df_ext_defconfig | 2 -
configs/at91sam9260dfc_defconfig | 2 -
configs/at91sam9260dfc_ext_defconfig | 2 -
configs/at91sam9261ek_defconfig | 2 -
configs/at91sam9261ek_ext_defconfig | 2 -
configs/at91sam9263ek_defconfig | 2 -
configs/at91sam9263ek_ext_defconfig | 2 -
configs/at91sam9g20dfc_defconfig | 2 -
configs/at91sam9g20dfc_ext_defconfig | 2 -
configs/atngw100-base_defconfig | 2 -
configs/atngw100_defconfig | 5 -
configs/atstk1005_defconfig | 2 -
configs/atstk100x_defconfig | 2 -
configs/integrator926_defconfig | 2 -
configs/integrator926_huge_defconfig | 2 -
package/nasm/nasm.mk | 19 +
target/Config.in | 9 -
target/Makefile.in | 8 -
target/device/Atmel/Config.in | 4 -
target/device/Atmel/Makefile.in | 12 -
target/device/Atmel/arch-arm/Makefile.in | 2 -
.../2009.01/u-boot-2009.01-001-at91rm9200.patch | 723 ------------------
.../u-boot-2009.01-002-at91rm9200dk.h.patch | 309 --------
.../2009.01/u-boot-2009.01-003-at91rm9200dk.patch | 324 --------
.../2009.01/u-boot-2009.01-004-at91rm9200ek.patch | 536 -------------
.../2009.01/u-boot-2009.01-005-at91sam9g20ek.patch | 801 --------------------
.../u-boot-2009.01-006-drivers-net-macb.c.patch | 28 -
.../u-boot/2009.01/u-boot-2009.01-007-tools.patch | 576 --------------
.../2009.01/u-boot-2009.01-008-Makefile.patch | 64 --
.../2009.01/u-boot-2009.01-009-factory.patch | 323 --------
.../2009.01/u-boot-2009.01-010-coloured_led.patch | 196 -----
.../u-boot/2009.01/u-boot-2009.01-011-spimux.patch | 93 ---
.../2009.01/u-boot-2009.01-012-ethinit.patch | 77 --
.../2009.01/u-boot-2009.01-013-configs.patch | 130 ----
target/device/Atmel/arch-arm/u-boot/Config.in | 21 -
target/device/Atmel/arch-arm/u-boot/Makefile.in | 4 -
target/device/Config.in.u-boot | 9 -
target/powerpc/Makefile.in | 1 -
target/powerpc/yaboot/Config.in | 5 -
target/powerpc/yaboot/yaboot.mk | 44 --
target/u-boot/Config.in | 378 ---------
target/u-boot/Makefile.in | 293 -------
...boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 13 -
target/x86/Makefile.in | 3 -
target/x86/grub2/Config.in | 13 -
.../x86/grub2/grub-1.95-001-fix-grub-install.patch | 23 -
target/x86/grub2/grub2.mk | 134 ----
target/x86/syslinux/syslinux-3.82-makefile.patch | 11 -
target/x86/syslinux/syslinux.mk | 70 --
77 files changed, 679 insertions(+), 5369 deletions(-)
create mode 100644 boot/Config.in
rename {target/device/Atmel => boot}/at91bootstrap/Config.in (71%)
rename {target/device/Atmel => boot}/at91bootstrap/at91bootstrap.mk (65%)
rename {target/device/Atmel/DataFlashBoot => boot/at91dataflashboot}/Config.in (53%)
create mode 100644 boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch
create mode 100644 boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch
rename target/device/Atmel/DataFlashBoot/DataflashBoot.mk => boot/at91dataflashboot/at91dataflashboot.mk (65%)
create mode 100644 boot/barebox/Config.in
create mode 100644 boot/barebox/barebox.mk
create mode 100644 boot/common.mk
rename {target/x86 => boot}/grub/Config.in (100%)
rename {target/x86 => boot}/grub/grub.100-autoreconf.patch (100%)
rename {target/x86 => boot}/grub/grub.200-fix_mbr_handling.patch (100%)
rename {target/x86 => boot}/grub/grub.300-honor_UCLIBC_HAS_LFS.patch (100%)
rename {target/x86 => boot}/grub/grub.400-nic_update2.patch.bz2 (100%)
rename {target/x86 => boot}/grub/grub.mk (89%)
rename {target/x86 => boot}/grub/menu.lst (100%)
rename {target/x86 => boot}/grub/splash.xpm.gz (100%)
create mode 100644 boot/grub2/Config.in
create mode 100644 boot/grub2/grub2.mk
rename {target/x86 => boot}/syslinux/Config.in (100%)
create mode 100644 boot/syslinux/syslinux-3.85-makefile.patch
create mode 100644 boot/syslinux/syslinux.mk
create mode 100644 boot/u-boot/Config.in
create mode 100644 boot/u-boot/u-boot.mk
create mode 100644 package/nasm/nasm.mk
delete mode 100644 target/device/Atmel/arch-arm/Makefile.in
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch
delete mode 100644 target/device/Atmel/arch-arm/u-boot/Config.in
delete mode 100644 target/device/Atmel/arch-arm/u-boot/Makefile.in
delete mode 100644 target/device/Config.in.u-boot
delete mode 100644 target/powerpc/Makefile.in
delete mode 100644 target/powerpc/yaboot/Config.in
delete mode 100644 target/powerpc/yaboot/yaboot.mk
delete mode 100644 target/u-boot/Config.in
delete mode 100644 target/u-boot/Makefile.in
delete mode 100644 target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
delete mode 100644 target/x86/Makefile.in
delete mode 100644 target/x86/grub2/Config.in
delete mode 100644 target/x86/grub2/grub-1.95-001-fix-grub-install.patch
delete mode 100644 target/x86/grub2/grub2.mk
delete mode 100644 target/x86/syslinux/syslinux-3.82-makefile.patch
delete mode 100644 target/x86/syslinux/syslinux.mkThanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/46 bootloaders: move bootloader build code to boot/
Signed-off-by Thomas Petazzoni <[email protected]>
---
Config.in | 2 ++
Makefile | 3 ++-
boot/Config.in | 12 ++++++++++++
.../device/Atmel => boot}/at91bootstrap/Config.in | 5 ++---
.../Atmel => boot}/at91bootstrap/at91bootstrap.mk | 2 +-
.../at91dataflashboot}/Config.in | 6 +++---
.../at91dataflashboot/at91dataflashboot.mk | 0
boot/common.mk | 1 +
{target/x86 => boot}/grub/Config.in | 0
.../x86 => boot}/grub/grub.100-autoreconf.patch | 0
.../grub/grub.200-fix_mbr_handling.patch | 0
.../grub/grub.300-honor_UCLIBC_HAS_LFS.patch | 0
.../grub/grub.400-nic_update2.patch.bz2 | Bin 328903 -> 328903 bytes
{target/x86 => boot}/grub/grub.mk | 2 +-
{target/x86 => boot}/grub/menu.lst | 0
{target/x86 => boot}/grub/splash.xpm.gz | Bin 45185 -> 45185 bytes
{target/x86 => boot}/grub2/Config.in | 0
.../grub2/grub-1.95-001-fix-grub-install.patch | 0
{target/x86 => boot}/grub2/grub2.mk | 2 +-
{target/x86 => boot}/syslinux/Config.in | 0
.../syslinux/syslinux-3.82-makefile.patch | 0
{target/x86 => boot}/syslinux/syslinux.mk | 2 +-
{target => boot}/u-boot/Config.in | 0
{target => boot}/u-boot/Makefile.in | 2 +-
...boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 0
{target/powerpc => boot}/yaboot/Config.in | 0
{target/powerpc => boot}/yaboot/yaboot.mk | 0
target/Config.in | 9 ---------
target/Makefile.in | 8 --------
target/device/Atmel/Config.in | 4 ----
target/device/Atmel/Makefile.in | 12 ------------
target/powerpc/Makefile.in | 1 -
target/x86/Makefile.in | 3 ---
33 files changed, 27 insertions(+), 49 deletions(-)
create mode 100644 boot/Config.in
rename {target/device/Atmel => boot}/at91bootstrap/Config.in (92%)
rename {target/device/Atmel => boot}/at91bootstrap/at91bootstrap.mk (96%)
rename {target/device/Atmel/DataFlashBoot => boot/at91dataflashboot}/Config.in (76%)
rename target/device/Atmel/DataFlashBoot/DataflashBoot.mk => boot/at91dataflashboot/at91dataflashboot.mk (100%)
create mode 100644 boot/common.mk
rename {target/x86 => boot}/grub/Config.in (100%)
rename {target/x86 => boot}/grub/grub.100-autoreconf.patch (100%)
rename {target/x86 => boot}/grub/grub.200-fix_mbr_handling.patch (100%)
rename {target/x86 => boot}/grub/grub.300-honor_UCLIBC_HAS_LFS.patch (100%)
rename {target/x86 => boot}/grub/grub.400-nic_update2.patch.bz2 (100%)
rename {target/x86 => boot}/grub/grub.mk (98%)
rename {target/x86 => boot}/grub/menu.lst (100%)
rename {target/x86 => boot}/grub/splash.xpm.gz (100%)
rename {target/x86 => boot}/grub2/Config.in (100%)
rename {target/x86 => boot}/grub2/grub-1.95-001-fix-grub-install.patch (100%)
rename {target/x86 => boot}/grub2/grub2.mk (98%)
rename {target/x86 => boot}/syslinux/Config.in (100%)
rename {target/x86 => boot}/syslinux/syslinux-3.82-makefile.patch (100%)
rename {target/x86 => boot}/syslinux/syslinux.mk (96%)
rename {target => boot}/u-boot/Config.in (100%)
rename {target => boot}/u-boot/Makefile.in (99%)
rename {target => boot}/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 (100%)
rename {target/powerpc => boot}/yaboot/Config.in (100%)
rename {target/powerpc => boot}/yaboot/yaboot.mk (100%)
delete mode 100644 target/powerpc/Makefile.in
delete mode 100644 target/x86/Makefile.inConfig.in +2 -0
@@ -293,4 +293,6 @@ source "package/Config.in" source "fs/Config.in" +source "boot/Config.in" + source "target/Config.in"
Makefile +2 -1
@@ -320,8 +320,9 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) TARGETS+=target-purgelocales endif -# target stuff is last so it can override anything else +include boot/common.mk include target/Makefile.in +include fs/common.mk TARGETS+=erase-fakeroots
boot/Config.in new file +12 -0
@@ -0,0 +1,12 @@ +menu "Bootloaders" + +source "boot/grub/Config.in" +source "boot/grub2/Config.in" +source "boot/syslinux/Config.in" +source "boot/yaboot/Config.in" +source "boot/u-boot/Config.in" +source "boot/at91bootstrap/Config.in" +source "boot/at91dataflashboot/Config.in" + +endmenu +
boot/at91bootstrap/Config.in renamed from target/device/Atmel/at91bootstrap/Config.in +2 -3
@@ -1,7 +1,6 @@ menuconfig BR2_TARGET_AT91BOOTSTRAP - depends on BR2_TARGET_AT91SAM9260EK || BR2_TARGET_AT91SAM9260DFC || BR2_TARGET_AT91SAM9260PF || \ - BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK || BR2_TARGET_AT91SAM9G20DFC - bool "Build AT91 Bootstrap for selected chip" + depends on BR2_arm + bool "AT91 Bootstrap" if BR2_TARGET_AT91BOOTSTRAP
boot/at91bootstrap/at91bootstrap.mk renamed from target/device/Atmel/at91bootstrap/at91bootstrap.mk +1 -1
@@ -39,7 +39,7 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) mkdir -p $(BUILD_DIR) $(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch + toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) boot/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch touch $(AT91BOOTSTRAP_DIR)/.unpacked $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
boot/at91dataflashboot/Config.in renamed from target/device/Atmel/DataFlashBoot/Config.in +3 -3
@@ -1,6 +1,6 @@ -config BR2_TARGET_DATAFLASHBOOT - depends on BR2_TARGET_AT91RM9200 || BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S - bool "Build Dataflashboot for selected chip" +menuconfig BR2_TARGET_DATAFLASHBOOT + depends on BR2_arm + bool "AT91 DataFlashBoot" choice prompt "Target Architecture"
boot/at91dataflashboot/at91dataflashboot.mk renamed from target/device/Atmel/DataFlashBoot/DataflashBoot.mk +0 -0
boot/common.mk new file +1 -0
@@ -0,0 +1 @@ +include boot/*/*.mk
boot/grub/Config.in renamed from target/x86/grub/Config.in +0 -0
boot/grub/grub.100-autoreconf.patch renamed from target/x86/grub/grub.100-autoreconf.patch +0 -0
boot/grub/grub.200-fix_mbr_handling.patch renamed from target/x86/grub/grub.200-fix_mbr_handling.patch +0 -0
boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch renamed from target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch +0 -0
boot/grub/grub.mk renamed from target/x86/grub/grub.mk +1 -1
@@ -75,7 +75,7 @@ $(GRUB_DIR)/.unpacked: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH) for i in `grep -v "^#" $(GRUB_DIR)/debian/patches/00list`; do \ cat $(GRUB_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB_DIR); \ done - toolchain/patch-kernel.sh $(GRUB_DIR) target/x86/grub grub.\*.patch{,.bz2} + toolchain/patch-kernel.sh $(GRUB_DIR) boot/grub grub.\*.patch{,.bz2} touch $@ $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked
boot/grub/menu.lst renamed from target/x86/grub/menu.lst +0 -0
boot/grub2/Config.in renamed from target/x86/grub2/Config.in +0 -0
boot/grub2/grub-1.95-001-fix-grub-install.patch renamed from target/x86/grub2/grub-1.95-001-fix-grub-install.patch +0 -0
boot/grub2/grub2.mk renamed from target/x86/grub2/grub2.mk +1 -1
@@ -75,7 +75,7 @@ $(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH) for i in `grep -v "^#" $(GRUB2_DIR)/debian/patches/00list`; do \ cat $(GRUB2_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB2_DIR); \ done - toolchain/patch-kernel.sh $(GRUB2_DIR) target/x86/grub2 grub-\*.patch + toolchain/patch-kernel.sh $(GRUB2_DIR) boot/grub2 grub-\*.patch touch $@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
boot/syslinux/Config.in renamed from target/x86/syslinux/Config.in +0 -0
boot/syslinux/syslinux-3.82-makefile.patch renamed from target/x86/syslinux/syslinux-3.82-makefile.patch +0 -0
boot/syslinux/syslinux.mk renamed from target/x86/syslinux/syslinux.mk +1 -1
@@ -38,7 +38,7 @@ syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH) $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch + toolchain/patch-kernel.sh $(SYSLINUX_DIR) boot/syslinux/ \*.patch touch -c $@ $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile
boot/u-boot/Config.in renamed from target/u-boot/Config.in +0 -0
boot/u-boot/Makefile.in renamed from target/u-boot/Makefile.in +1 -1
@@ -70,7 +70,7 @@ $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE) touch $@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked - toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \ + toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \ u-boot-$(U_BOOT_VERSION)-\*.patch \ u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH) ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)
boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 renamed from target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 +0 -0
boot/yaboot/Config.in renamed from target/powerpc/yaboot/Config.in +0 -0
boot/yaboot/yaboot.mk renamed from target/powerpc/yaboot/yaboot.mk +0 -0
target/Config.in +0 -9
@@ -1,12 +1,3 @@ -menu "Bootloaders" - -source "target/x86/grub/Config.in" -#source "target/x86/grub2/Config.in" -source "target/x86/syslinux/Config.in" -source "target/powerpc/yaboot/Config.in" -source "target/u-boot/Config.in" -endmenu - menu "Kernel" choice prompt "Kernel type"
target/Makefile.in +0 -8
@@ -54,16 +54,8 @@ include target/generic/Makefile.in # this eventually adds the kernel target to TARGETS: include target/device/Makefile.in -include target/x86/Makefile.in -include target/powerpc/Makefile.in include target/xtensa/Makefile.in -ifeq ($(BR2_TARGET_UBOOT),y) -include target/u-boot/Makefile.in -endif - -include fs/common.mk - # kernel rules # We already did add the kernel target to TARGETS and now just pull in the rules # to actually build this target.
target/device/Atmel/Config.in +0 -4
@@ -66,8 +66,4 @@ config BR2_BOARD_PATH endmenu -source "target/device/Atmel/DataFlashBoot/Config.in" - -source "target/device/Atmel/at91bootstrap/Config.in" - endif
target/device/Atmel/Makefile.in +0 -12
@@ -66,18 +66,6 @@ include target/device/Atmel/*/Makefile.in UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h -#ifeq ($(BR2_TARGET_UBOOT_AT91),y) -#include $(ATMEL_PATH)/u-boot/u-boot.mk -#endif - -ifeq ($(BR2_TARGET_DATAFLASHBOOT),y) -include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk -endif - -ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y) -include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk -endif - atmel_status: @echo BUILD_DIR=$(BUILD_DIR) @echo BOARD_NAME=$(BOARD_NAME)
target/powerpc/Makefile.in deleted +0 -1
@@ -1 +0,0 @@ -include target/powerpc/*/*.mk
target/x86/Makefile.in deleted +0 -3
@@ -1,3 +0,0 @@ -ifeq ($(BR2_i386),y) -include target/x86/*/*.mk -endif
Signature · 1 line
1.7.0.4
PATCH 2/46 yaboot: drop support
In reply to Thomas PetazzoniYaboot does not build, hasn't been updated since a long time, and isn't very common these days on embedded PowerPC platforms.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/Config.in | 1 - boot/yaboot/Config.in | 5 ----- boot/yaboot/yaboot.mk | 44 -------------------------------------------- 3 files changed, 0 insertions(+), 50 deletions(-) delete mode 100644 boot/yaboot/Config.in delete mode 100644 boot/yaboot/yaboot.mk
boot/Config.in +0 -1
@@ -3,7 +3,6 @@ menu "Bootloaders" source "boot/grub/Config.in" source "boot/grub2/Config.in" source "boot/syslinux/Config.in" -source "boot/yaboot/Config.in" source "boot/u-boot/Config.in" source "boot/at91bootstrap/Config.in" source "boot/at91dataflashboot/Config.in"
boot/yaboot/Config.in deleted +0 -5
@@ -1,5 +0,0 @@ -config BR2_TARGET_YABOOT - bool "yaboot" - depends on BR2_powerpc - help - The yaboot bootloader for new world powerpc systems.
boot/yaboot/yaboot.mk deleted +0 -44
44 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 3/46 boot: remove references to COPYTO
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 6 ------ boot/at91dataflashboot/at91dataflashboot.mk | 3 +-- 2 files changed, 1 insertions(+), 8 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +0 -6
@@ -63,22 +63,16 @@ $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET) mkdir -p $(BINARIES_DIR) ifeq ($(AT91BOOTSTRAP_VERSION),2.3) cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) - $(call COPY_FILE, $(AT91BOOTSTRAP_TARGET), $(BR2_TARGET_ATMEL_COPYTO), $(AT91BOOTSTRAP_BINARY)) else make MEMORY=$(AT91BOOTSTRAP_MEMORY) \ CROSS_COMPILE=$(TARGET_CROSS) \ -C $(AT91BOOTSTRAP_DIR) boot make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \ echo "Could not copy bootstrap to BINARIES_DIR" -ifneq ($(BR2_TARGET_ATMEL_COPYTO),) - make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install || \ - echo "Could not copy bootstrap to BR2_ATMEL_COPYTO" -endif endif touch $@ # cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) -# cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY) .PHONY: at91bootstrap at91bootstrap-source
boot/at91dataflashboot/at91dataflashboot.mk +1 -2
@@ -31,8 +31,7 @@ DataflashBoot-dirclean: rm -rf $(DATAFLASHBOOT_DIR) dataflash: $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) - $(call COPY_FILE, $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY), $(TARGET_ATMEL_COPYTO), $(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)) - + cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR) ############################################################# #
Signature · 1 line
1.7.0.4
PATCH 4/46 u-boot: do not default to $(BOARD_NAME) for the board name
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
boot/u-boot/Config.in +0 -1
@@ -6,7 +6,6 @@ menuconfig BR2_TARGET_UBOOT if BR2_TARGET_UBOOT config BR2_TARGET_UBOOT_BOARDNAME string "board name" - default "$(BOARD_NAME)" help One of U-Boot supported boards to be built. This will be suffixed with _config to meet U-Boot standard naming.
Signature · 1 line
1.7.0.4
PATCH 5/46 u-boot: remove ancient versions
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-)
boot/u-boot/Config.in +0 -26
@@ -25,26 +25,6 @@ config BR2_TARGET_UBOOT_2009_11 config BR2_TARGET_UBOOT_2009_08 bool "u-boot-2009.08" -config BR2_TARGET_UBOOT_2009_06 - bool "u-boot-2009.06" - depends on BR2_DEPRECATED - -config BR2_TARGET_UBOOT_2009_03 - bool "u-boot-2009.03" - depends on BR2_DEPRECATED - -config BR2_TARGET_UBOOT_2009_01 - bool "u-boot-2009.01" - depends on BR2_DEPRECATED - -config BR2_TARGET_UBOOT_2008_10 - bool "u-boot-2008.10" - depends on BR2_DEPRECATED - -config BR2_TARGET_UBOOT_1_2_0_ATMEL - bool "u-boot-1.2.0-atmel" - depends on BR2_TARGET_AT91 - endchoice config BR2_UBOOT_VERSION
@@ -52,15 +32,9 @@ config BR2_UBOOT_VERSION default "2010.03" if BR2_TARGET_UBOOT_2010_03 default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 - default "2009.06" if BR2_TARGET_UBOOT_2009_06 - default "2009.03" if BR2_TARGET_UBOOT_2009_03 - default "2009.01" if BR2_TARGET_UBOOT_2009_01 - default "2008.10" if BR2_TARGET_UBOOT_2008_10 - default "1.2.0-atmel" if BR2_TARGET_UBOOT_1_2_0_ATMEL config BR2_U_BOOT_SITE string - default "$(BR2_ATMEL_MIRROR)" if BR2_TARGET_UBOOT_1_2_0_ATMEL default "ftp://ftp.denx.de/pub/u-boot" source "target/device/Config.in.u-boot"
Signature · 1 line
1.7.0.4
PATCH 6/46 u-boot: rename Makefile.in to u-boot.mk for coherency
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
---
boot/u-boot/{Makefile.in => u-boot.mk} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename boot/u-boot/{Makefile.in => u-boot.mk} (100%)boot/u-boot/u-boot.mk renamed from boot/u-boot/Makefile.in +0 -0
Signature · 1 line
1.7.0.4
PATCH 7/46 u-boot: remove option to configure download site
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 4 ---- boot/u-boot/u-boot.mk | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-)
boot/u-boot/Config.in +0 -4
@@ -33,10 +33,6 @@ config BR2_UBOOT_VERSION default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 -config BR2_U_BOOT_SITE - string - default "ftp://ftp.denx.de/pub/u-boot" - source "target/device/Config.in.u-boot" config BR2_TARGET_UBOOT_CUSTOM_PATCH
boot/u-boot/u-boot.mk +1 -1
@@ -7,7 +7,7 @@ U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 -U_BOOT_SITE:=$(call qstrip,$(BR2_U_BOOT_SITE)) +U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches U_BOOT_CAT:=$(BZCAT)
Signature · 1 line
1.7.0.4
PATCH 7/46 u-boot: remove option to configuredownload site
Quoted 43 lines
-----Original Message-----
From: buildroot-bounces at busybox.net [mailto:buildroot- bounces at busybox.net] On Behalf Of Thomas Petazzoni
Sent: Tuesday, 1 June 2010 8:08 AM
To: buildroot at uclibc.org
Cc: Thomas Petazzoni
Subject: [Buildroot] [PATCH 07/46] u-boot: remove option to configuredownload siteSigned-off-by Thomas Petazzoni <[email protected]>--- boot/u-boot/Config.in | 4 ---- boot/u-boot/u-boot.mk | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-)boot/u-boot/Config.in index renamed from boot/u-boot/Config.in +0
-049d66c4..3f4110a 100644
boot/u-boot/Config.in +0
-4@@ -33,10 +33,6 @@ config BR2_UBOOT_VERSION default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 -config BR2_U_BOOT_SITE - string - default "ftp://ftp.denx.de/pub/u-boot" - source "target/device/Config.in.u-boot" config BR2_TARGET_UBOOT_CUSTOM_PATCHboot/u-boot/u-boot.mk index renamed from boot/u-boot/u-boot.mk +0
-0a875f2b..7e98ca8 100644
boot/u-boot/u-boot.mk +1
-1@@ -7,7 +7,7 @@ U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 -U_BOOT_SITE:=$(call qstrip,$(BR2_U_BOOT_SITE)) +U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
Quoted 1 line
U_BOOT_CAT:=$(BZCAT)
It would be good if we could keep this feature - I'm in the process of adding support for the Mini2440 ARM boards and there is no mainline support for them in uboot, so buildroot needs to get uboot from
http://repo.or.cz/w/u-boot-openmoko/mini2440.git/snapshot/HEAD.tar.gz or the git equivalent when git support is added.
I guess another way is to just put an #ifdef equivilant in u-boot.mk to change the download location but that's a bit ugly.
Cheers,
Paul.
PATCH 7/46 u-boot: remove option to configuredownload site
Quoted 8 lines · On Wed, 2 Jun 2010 17:14:18 +1000 "Paul Jones" <[email protected]> wrote:
It would be good if we could keep this feature - I'm in the process of adding support for the Mini2440 ARM boards and there is no mainline support for them in uboot, so buildroot needs to get uboot from
http://repo.or.cz/w/u-boot-openmoko/mini2440.git/snapshot/HEAD.tar.gz or the git equivalent when git support is added.I guess another way is to just put an #ifdef equivilant in u-boot.mk to change the download location but that's a bit ugly.
Thanks for the feedback. I'll add something that allows to download arbitrary tarballs. That's something that I also did for my Linux kernel code cleanup in Buildroot, so I'll reuse the same scheme. I'll post an updated version of this patch probably during this WE.
However, I don't think having a Buildroot configuration that depends on something as "unstable" as an arbitrary development snapshot is a good idea. I'd prefer if the Buildroot configuration was using a particular tag or commit, so that the build is reproducible.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 7/46 u-boot: remove option to configuredownload site
Quoted 4 lines · On Fri, 4 Jun 2010 10:32:32 +0200 Thomas Petazzoni…
Thanks for the feedback. I'll add something that allows to download arbitrary tarballs. That's something that I also did for my Linux kernel code cleanup in Buildroot, so I'll reuse the same scheme. I'll post an updated version of this patch probably during this WE.
Here my proposal to improve U-Boot support to take into account the issue you reported:
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 7/46 u-boot: remove option to configuredownload site
Quoted 16 lines
-----Original Message-----
From: buildroot-bounces at busybox.net [mailto:buildroot- bounces at busybox.net] On Behalf Of Thomas Petazzoni
Sent: Saturday, 5 June 2010 11:50 PM
To: buildroot at busybox.net
Subject: Re: [Buildroot] [PATCH 07/46] u-boot: remove option to configuredownload siteQuoted 4 lines · On Fri, 4 Jun 2010 10:32:32 +0200 Thomas Petazzoni…
Thanks for the feedback. I'll add something that allows to download arbitrary tarballs. That's something that I also did for my Linux kernel code cleanup in Buildroot, so I'll reuse the same scheme. I'll post an updated version of this patch probably during this WE.
Quoted 5 lines
Here my proposal to improve U-Boot support to take into account the issue you reported:
http://git.buildroot.net/~tpetazzoni/git/buildroot/commit/?h=bootloaders-
cleanup&id=13ef908685caecd17ba67953fd1fee8a559231a2
That is perfect! Thanks. Tested and working.
There seems to be a bug in your bootloaders-cleanup branch somewhere. If I do a make distclean and then configure the kernel to be built into a uImage I get the following error:
(have attached .config)
Verbose user fault messages (DEBUG_USER) [N/y/?] n
Verbose kernel error messages (DEBUG_ERRORS) [N/y/?] n Enable stack utilization instrumentation (DEBUG_STACK_USAGE) [N/y/?] n Kernel low-level debugging functions (DEBUG_LL) [N/y/?] n
#
# configuration written to .config # make[1]: Leaving directory `/home/peejay/mini2440-dev/buildroot/output/build/linux-2.6.32.13' touch /home/peejay/mini2440-dev/buildroot/output/build/linux-2.6.32.13/.configured mkdir -p /home/peejay/mini2440-dev/buildroot/output/build/u-boot-tools cp /home/peejay/mini2440-dev/buildroot/output/host/usr/bin/mkimage /home/peejay/mini2440-dev/buildroot/output/build/u-boot-tools cp: cannot stat `/home/peejay/mini2440-dev/buildroot/output/host/usr/bin/mkimage': No such file or directory make: *** [/home/peejay/mini2440-dev/buildroot/output/build/u-boot-tools/mkimage] Error 1 -------------- next part -------------- A non-text attachment was scrubbed... Name: config Type: application/octet-stream Size: 19284 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100606/0ca3b1fd/attachment-0001.obj>
PATCH 7/46 u-boot: remove option to configuredownload site
Quoted 4 lines · On Sun, 6 Jun 2010 17:29:35 +1000 "Paul Jones" <[email protected]> wrote:
Quoted 2 lines
http://git.buildroot.net/~tpetazzoni/git/buildroot/commit/?h=bootloaders-
cleanup&id=13ef908685caecd17ba67953fd1fee8a559231a2That is perfect! Thanks. Tested and working.
Great! Nice to see that developers are testing these new features :-)
Quoted 4 lines
There seems to be a bug in your bootloaders-cleanup branch somewhere. If I do a make distclean and then configure the kernel to be built into a uImage I get the following error:
(have attached .config)
Yeah, got it. Will fix it later today.
The thing is that on top of my bootloaders-cleanup branch, I've written a linux-cleanup branch
(http://git.buildroot.net/~tpetazzoni/git/buildroot/log/?h=linux-cleanup)
which cleanups/simplifies the code to compile the Linux kernel. And in this branch, the dependency of uImage on mkimage is handled properly (because I tested the kernel build with linux-cleanup over bootloaders-cleanup).
However, I forgot to test the kernel build with just bootloaders-cleanup, and therefore forgot to fix the mkimage dependency. I'll do this so that the bootloaders-cleanup branch can be merged alone, without linux-cleanup and without breaking uImage builds.
Thanks again a lot for your tests,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 7/46 u-boot: remove option to configuredownload site
In reply to Paul JonesQuoted 4 lines · On Sun, 6 Jun 2010 17:29:35 +1000 "Paul Jones" <[email protected]> wrote:
There seems to be a bug in your bootloaders-cleanup branch somewhere. If I do a make distclean and then configure the kernel to be built into a uImage I get the following error:
(have attached .config)
Fixed by
http://git.buildroot.net/~tpetazzoni/git/buildroot/commit/?h=bootloaders-cleanup&id=cc8813eaab198ee4d142a38d1e5eebc8e41561b3
which is a new commit in my bootloaders-cleanup branch.
Thanks for your test report!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 8/46 u-boot: remove arch specific patches infrastructure
In reply to Thomas PetazzoniA very complicated infrastructure for just a special case, for an ancient version of U-Boot. Recent versions of U-Boot are reported to work just fine on Atmel ARM evaluation boards.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 2 - target/device/Atmel/arch-arm/Makefile.in | 2 - .../2009.01/u-boot-2009.01-001-at91rm9200.patch | 723 ------------------ .../u-boot-2009.01-002-at91rm9200dk.h.patch | 309 -------- .../2009.01/u-boot-2009.01-003-at91rm9200dk.patch | 324 -------- .../2009.01/u-boot-2009.01-004-at91rm9200ek.patch | 536 ------------- .../2009.01/u-boot-2009.01-005-at91sam9g20ek.patch | 801 -------------------- .../u-boot-2009.01-006-drivers-net-macb.c.patch | 28 - .../u-boot/2009.01/u-boot-2009.01-007-tools.patch | 576 -------------- .../2009.01/u-boot-2009.01-008-Makefile.patch | 64 -- .../2009.01/u-boot-2009.01-009-factory.patch | 323 -------- .../2009.01/u-boot-2009.01-010-coloured_led.patch | 196 ----- .../u-boot/2009.01/u-boot-2009.01-011-spimux.patch | 93 --- .../2009.01/u-boot-2009.01-012-ethinit.patch | 77 -- .../2009.01/u-boot-2009.01-013-configs.patch | 130 ---- target/device/Atmel/arch-arm/u-boot/Config.in | 21 - target/device/Atmel/arch-arm/u-boot/Makefile.in | 4 - target/device/Config.in.u-boot | 9 - 18 files changed, 0 insertions(+), 4218 deletions(-) delete mode 100644 target/device/Atmel/arch-arm/Makefile.in delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch delete mode 100644 target/device/Atmel/arch-arm/u-boot/Config.in delete mode 100644 target/device/Atmel/arch-arm/u-boot/Makefile.in delete mode 100644 target/device/Config.in.u-boot
boot/u-boot/Config.in +0 -2
@@ -33,8 +33,6 @@ config BR2_UBOOT_VERSION default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 -source "target/device/Config.in.u-boot" - config BR2_TARGET_UBOOT_CUSTOM_PATCH string "custom patch" help
target/device/Atmel/arch-arm/Makefile.in deleted +0 -2
@@ -1,2 +0,0 @@ -include target/device/Atmel/arch-arm/u-boot/Makefile.in -
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch deleted +0 -723
723 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch deleted +0 -309
309 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch deleted +0 -324
324 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch deleted +0 -536
536 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch deleted +0 -801
801 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch deleted +0 -28
@@ -1,28 +0,0 @@ -diff -urN u-boot-2008.10-0rig/drivers/net/macb.c u-boot-2008.10/drivers/net/macb.c ---- u-boot-2008.10-0rig/drivers/net/macb.c 2008-10-18 21:30:31.000000000 +0200 -+++ u-boot-2008.10/drivers/net/macb.c 2008-12-28 23:44:11.000000000 +0100 -@@ -415,18 +415,16 @@ - - /* choose RMII or MII mode. This depends on the board */ - #ifdef CONFIG_RMII --#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ -- defined(CONFIG_AT91SAM9263) -- macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); --#else -+#if defined(CONFIG_AVR32) - macb_writel(macb, USRIO, 0); --#endif - #else --#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ -- defined(CONFIG_AT91SAM9263) -- macb_writel(macb, USRIO, MACB_BIT(CLKEN)); -+ macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); -+#endif - #else -+#if defined(CONFIG_AVR32) - macb_writel(macb, USRIO, MACB_BIT(MII)); -+#else -+ macb_writel(macb, USRIO, MACB_BIT(CLKEN)); - #endif - #endif /* CONFIG_RMII */ -
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch deleted +0 -576
269 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch deleted +0 -64
64 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch deleted +0 -323
323 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch deleted +0 -196
196 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch deleted +0 -93
93 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch deleted +0 -77
77 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch deleted +0 -130
130 lines not on this page · raw message
target/device/Atmel/arch-arm/u-boot/Config.in deleted +0 -21
Lines of this file are not shown. View the raw message.
target/device/Atmel/arch-arm/u-boot/Makefile.in deleted +0 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.4
Part of the diff is not shown here. View the raw message.
PATCH 9/46 u-boot: remove u-boot-status make target
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-)
boot/u-boot/u-boot.mk +0 -15
@@ -276,18 +276,3 @@ $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting) endif endif - -u-boot-status: - @echo - @echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE) - @echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION) - @echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP) - @echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR) - @echo BR2_TARGET_UBOOT_GATEWAY = $(BR2_TARGET_UBOOT_GATEWAY) - @echo BR2_TARGET_UBOOT_NETMASK = $(BR2_TARGET_UBOOT_NETMASK) - @echo BR2_TARGET_UBOOT_ETH0ADDR = $(BR2_TARGET_UBOOT_ETHADDR) - @echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR) - @echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT) - @echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME) - @exit 0 -
Signature · 1 line
1.7.0.4
PATCH 10/46 u-boot: remove reference to old 1.2.0-atmel version
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
boot/u-boot/u-boot.mk +0 -4
@@ -46,11 +46,7 @@ ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y) U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv endif -U_BOOT_CONFIGURE_OPTS := - -ifneq ($(BR2_TARGET_UBOOT_1_2_0_ATMEL),) U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1 -endif # Define a helper function define insert_define
Signature · 1 line
1.7.0.4
PATCH 11/46 u-boot: simplify custom patch handling
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 9 ++++++--- boot/u-boot/u-boot.mk | 10 ++-------- 2 files changed, 8 insertions(+), 11 deletions(-)
boot/u-boot/Config.in +6 -3
@@ -33,10 +33,13 @@ config BR2_UBOOT_VERSION default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 -config BR2_TARGET_UBOOT_CUSTOM_PATCH - string "custom patch" +config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR + string "custom patch dir" help - If your board requires a custom patch, add the path to the file here. + If your board requires custom patches, add the path to the + directory containing the patches here. The patches must be + named u-boot-<version>-<something>.patch. + Most users may leave this empty choice
boot/u-boot/u-boot.mk +2 -8
@@ -9,7 +9,6 @@ U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) -U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
@@ -69,13 +68,8 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \ u-boot-$(U_BOOT_VERSION)-\*.patch \ u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH) -ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),) - toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_ARCH_PATCH_DIR) \*.patch -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"") - @mkdir -p $(U_BOOT_PATCH_DIR) - cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR) - toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) \*.patch +ifneq ($(qstrip $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),) + toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch endif touch $@
Signature · 1 line
1.7.0.4
PATCH 12/46 u-boot: remove patch for obsolete version
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- ...boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) delete mode 100644 boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 deleted +0 -13
@@ -1,13 +0,0 @@ -diff -urN u-boot-2009.01-rc3/include/asm-avr32/io.h u-boot-avr32//include/asm-avr32/io.h ---- u-boot-2009.01-rc3/include/asm-avr32/io.h 2009-01-18 21:37:48.000000000 +0100 -+++ u-boot-avr32//include/asm-avr32/io.h 2009-01-22 07:14:38.000000000 +0100 -@@ -125,9 +125,4 @@ - - } - --static inline phys_addr_t virt_to_phys(void * vaddr) --{ -- return (phys_addr_t)(vaddr); --} -- - #endif /* __ASM_AVR32_IO_H */
Signature · 1 line
1.7.0.4
PATCH 13/46 u-boot: remove useless symbolic link
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
boot/u-boot/u-boot.mk +1 -4
@@ -11,7 +11,6 @@ U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin -U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage MKIMAGE:=$(U_BOOT_TOOLS)
@@ -153,9 +152,7 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN) rm -f $(BINARIES_DIR)/$(U_BOOT_BIN) - rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN) - cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN) - (cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN)) + cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/ $(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN) mkdir -p $(@D)
Signature · 1 line
1.7.0.4
PATCH 14/46 u-boot: support building for mkimage
In reply to Thomas PetazzoniWhen mkimage needs to be built (when building an uImage for the Linux kernel is needed), but U-Boot hasn't been selected for compilation, U_BOOT_VERSION and U_BOOT_BOARD_NAME aren't defined. Define them to default values in this case.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-)
boot/u-boot/u-boot.mk +22 -7
@@ -4,6 +4,15 @@ # ############################################################# U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) +U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) + +# An U-Boot version and board might not be specified if U-Boot isn't +# explicitly selected, but mkimage needs to be compiled. In this case, +# we just take a random U-Boot version and configuration. +ifeq ($(U_BOOT_VERSION),) +U_BOOT_VERSION=2010.03 +U_BOOT_BOARD_NAME=smdk2410 +endif U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
@@ -30,9 +39,6 @@ TARGET_UBOOT_ETHADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_ETHADDR)) # u-boot still uses arch=ppc for powerpc U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc) -ifeq ($(UBOOT_BOARD_NAME),) -UBOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) -endif U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
@@ -73,6 +79,9 @@ endif touch $@ $(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched +ifeq ($(U_BOOT_BOARD_NAME),) + $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting) +endif $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -154,11 +163,17 @@ $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN) rm -f $(BINARIES_DIR)/$(U_BOOT_BIN) cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/ -$(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN) +$(MKIMAGE): $(U_BOOT_DIR)/.configured mkdir -p $(@D) - cp -dpf $(U_BOOT_DIR)/tools/mkimage $@ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + $(U_BOOT_CONFIGURE_OPTS) \ + $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \ + -C $(U_BOOT_DIR) tools + cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D) -$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN) +$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured mkdir -p $(@D) $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \ -DUSE_HOSTCC -o $@ \
@@ -171,7 +186,7 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ -$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN) +$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured mkdir -p $(@D) $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \ -DUSE_HOSTCC -o $@ \
Signature · 1 line
1.7.0.4
PATCH 14/46 u-boot: support building for mkimage
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> When mkimage needs to be built (when building an uImage for the Linux Thomas> kernel is needed), but U-Boot hasn't been selected for compilation, Thomas> U_BOOT_VERSION and U_BOOT_BOARD_NAME aren't defined. Define them to Thomas> default values in this case.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> boot/u-boot/u-boot.mk | 29 ++++++++++++++++++++++-------
Thomas> 1 files changed, 22 insertions(+), 7 deletions(-)
Thomas> diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk Thomas> index ac16c8b..1f5b216 100644
Thomas> --- a/boot/u-boot/u-boot.mk
Thomas> +++ b/boot/u-boot/u-boot.mk
Thomas> @@ -4,6 +4,15 @@
Thomas> # Thomas> ############################################################# Thomas> U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
Thomas> +U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) Thomas> +
Thomas> +# An U-Boot version and board might not be specified if U-Boot isn't Thomas> +# explicitly selected, but mkimage needs to be compiled. In this case, Thomas> +# we just take a random U-Boot version and configuration. Thomas> +ifeq ($(U_BOOT_VERSION),)
Thomas> +U_BOOT_VERSION=2010.03
Thomas> +U_BOOT_BOARD_NAME=smdk2410
Thomas> +endif
Thomas> # u-boot still uses arch=ppc for powerpc Thomas> U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
Does that work if KERNEL_ARCH != arm?
Thomas> +$(MKIMAGE): $(U_BOOT_DIR)/.configured
Thomas> mkdir -p $(@D)
Thomas> - cp -dpf $(U_BOOT_DIR)/tools/mkimage $@
Thomas> + $(TARGET_CONFIGURE_OPTS) \
Thomas> + CFLAGS="$(TARGET_CFLAGS)" \
Thomas> + LDFLAGS="$(TARGET_LDFLAGS)" \
Thomas> + $(U_BOOT_CONFIGURE_OPTS) \
Thomas> + $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
Thomas> + -C $(U_BOOT_DIR) tools
Thomas> + cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D)
Huh, isn't that supposed to be mkimage for the host? Why do you need to pass all this target stuff?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 14/46 u-boot: support building for mkimage
Quoted 11 lines · On Tue, 08 Jun 2010 23:45:58 +0200 Peter Korsgaard <[email protected]> wrote:
Thomas> U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) Thomas> +U_BOOT_BOARD_NAME:=$(call
Thomas> qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) +
Thomas> +# An U-Boot version and board might not be specified if Thomas> U-Boot isn't +# explicitly selected, but mkimage needs to be Thomas> compiled. In this case, +# we just take a random U-Boot Thomas> version and configuration. +ifeq ($(U_BOOT_VERSION),) Thomas> +U_BOOT_VERSION=2010.03
Thomas> +U_BOOT_BOARD_NAME=smdk2410
Thomas> +endif
Quoted 4 lines
Thomas> # u-boot still uses arch=ppc for powerpc Thomas> U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
Does that work if
KERNEL_ARCH!= arm?
Yes, it was. But I looked more closely at this and discovered that it was possible to build mkimage *without* configuring U-Boot. I've taken advantage of this to not configure U-Boot with a fake board.
Quoted 2 lines
Huh, isn't that supposed to be mkimage for the host? Why do you need to pass all this target stuff?
I've removed this and simplified the build of mkimage for the host.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 15/46 u-boot: further simplify the configuration
In reply to Thomas PetazzoniRemove all the bootsource selection mechanism and the horribly complicated BR2_TARGET_UBOOT_DEFAULT_ENV thing, which wanted to be generic, but was in fact very AT91-specific.
Just keep things simple: we build U-Boot with the board configuration file specified in BR2_TARGET_UBOOT_BOARDNAME.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/Config.in | 247 ------------------------------------------------- boot/u-boot/u-boot.mk | 113 ++--------------------- 2 files changed, 8 insertions(+), 352 deletions(-)
boot/u-boot/Config.in +0 -247
@@ -42,53 +42,6 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR Most users may leave this empty -choice - prompt "Bootsource" - depends on BR2_BOOTSOURCE - default BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD - - config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD - bool "Boot from dataflashcard" - depends on BR2_BOOTSOURCE_DATAFLASHCARD - - config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - bool "Boot from dataflash" - depends on BR2_BOOTSOURCE_DATAFLASH - - config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH - bool "Boot from a NAND flash" - depends on BR2_BOOTSOURCE_NANDFLASH - - config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH - bool "Boot from a parallell flash" - depends on BR2_BOOTSOURCE_FLASH - - config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD - bool "Boot from an SD-Card" - depends on BR2_BOOTSOURCE_SDCARD - - config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM - bool "Boot from a serial EEPROM (Not yet supported)" - depends on BR2_BOOTSOURCE_EEPROM - -endchoice - -config BR2_TARGET_UBOOT_BOOTSOURCE - string - depends on BR2_BOOTSOURCE - default "dataflash" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD - default "dataflash" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "nandflash" if BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH - default "flash" if BR2_TARGET_UBOOT_BOOTSOURCE_FLASH - default "sdcard" if BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD - default "eeprom" if BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM - -config BR2_TARGET_UBOOT_SILENT - bool "silent console" - help - If the option has been enabled, the output can be - silenced by setting the environment variable "silent". - config BR2_TARGET_UBOOT_TOOL_MKIMAGE bool "mkimage tool in target" help
@@ -99,165 +52,6 @@ config BR2_TARGET_UBOOT_TOOL_ENV help Install fw_printenv / fw_setenv tools in target. -menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV - bool "Generate a default environment" - help - Will generate variables for factory default command - and autoscript. - -if BR2_TARGET_UBOOT_DEFAULT_ENV -choice - prompt "SDRAM Memory size" - default BR2_TARGET_UBOOT_SDRAM_SIZE_64M - help - Size of the onboard SDRAM - -config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB - bool "256 MB" - -config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB - bool "128 MB" - -config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB - bool "64 MB" - -config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB - bool "32 MB" - -config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB - bool "16 MB" - -config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB - bool "8 MB" - -endchoice - -config BR2_TARGET_UBOOT_MEMORY_SIZE - string - default "256M" if BR2_TARGET_UBOOT_SDRAM_SIZE_256MB - default "128M" if BR2_TARGET_UBOOT_SDRAM_SIZE_128MB - default "64M" if BR2_TARGET_UBOOT_SDRAM_SIZE_64MB - default "32M" if BR2_TARGET_UBOOT_SDRAM_SIZE_32MB - default "16M" if BR2_TARGET_UBOOT_SDRAM_SIZE_16MB - default "8M" if BR2_TARGET_UBOOT_SDRAM_SIZE_8MB - -choice - prompt "Kernel Size" - default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB - -config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB - bool "Kernel size is less than 1.25 MB" - -config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB - bool "Kernel size is less than 1.50 MB" - -config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB - bool "Kernel size is less than 1.75 MB" - -config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB - bool "Kernel size is less than 2.00 MB" - -config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB - bool "Kernel size is less than 2.25 MB" - -config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB - bool "Kernel size is less than 2.50 MB" - -endchoice - -choice - prompt "Dataflash Size" - depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default BR2_TARGET_UBOOT_DATAFLASH_SIZE_2_00MB - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB - bool "Dataflash size is 8 MB" - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB - bool "Dataflash size is 4 MB" - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB - bool "Dataflash size is 2 MB" - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB - bool "Dataflash size is 1 MB" - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB - bool "Dataflash size is 0.5 MB" - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB - bool "Dataflash size is 0.25 MB" - -endchoice - -config BR2_TARGET_UBOOT_DATAFLASH_SIZE - string - depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "8M" if BR2_TARGET_DATAFLASH_SIZE_8MB - default "4M" if BR2_TARGET_DATAFLASH_SIZE_4MB - default "2M" if BR2_TARGET_DATAFLASH_SIZE_2MB - default "1M" if BR2_TARGET_DATAFLASH_SIZE_1MB - default "0.5M" if BR2_TARGET_DATAFLASH_SIZE_0_50MB - default "0.25M" if BR2_TARGET_DATAFLASH_SIZE_0_25MB - -config BR2_TARGET_UBOOT_END_OF_FLASH - string - depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "C083FFFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB - default "C041FFFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB - default "C020FFFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB - default "C0107FFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB - default "C0083FFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB - default "C0041FFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB - help - -config BR2_TARGET_UBOOT_KERNEL_START - string "Kernel SDRAM address" - default "21000000" - help - Kernel is loaded to this address in SDRAM - -config BR2_TARGET_UBOOT_KERNEL_LOCATION - string "Kernel flash address" - depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \ - BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "C0042000" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "" - help - Kernel location in dataflash - -config BR2_TARGET_UBOOT_FILESYSTEM_START - string - default "2114A000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB - default "2118C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB - default "211CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB - default "21210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB - default "21252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB - default "21294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB - help - Kernel is loaded to this SDRAM address - Assumes SDRAM starts at 20000000 - Will need to be updated if the SDRAM is located elsewhere - -config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION - string - depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \ - BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH - default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB - default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB - default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB - default "C0252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB - default "C0294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB - default "C02D6000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB - help - Determine location for File System in Dataflash - This needs to be updated for other memory technologies - -config BR2_TARGET_UBOOT_FILESYSTEM_SIZE - string "File System Size" - default "6000000" - help - menuconfig BR2_TARGET_UBOOT_NETWORK bool "Network Settings" default y
@@ -304,45 +98,4 @@ config BR2_TARGET_UBOOT_ETH1ADDR endif # BR2_TARGET_UBOOT_NETWORK -endif # BR2_TARGET_UBOOT_DEFAULT_ENV - endif # BR2_TARGET_UBOOT - -config BR2_BOOTSOURCE_DATAFLASHCARD - bool - help - Allow use of a dataflashcard as a boot source - -config BR2_BOOTSOURCE_DATAFLASH - bool - help - Allow use of a dataflash as a boot source - -config BR2_BOOTSOURCE_NANDFLASH - bool - help - Allow use of a NAND flash as a boot source - -config BR2_BOOTSOURCE_FLASH - bool - help - Allow use of a flash RAM as a boot source - -config BR2_BOOTSOURCE_SDCARD - bool - help - Allow use of an SD-card as a boot source - -config BR2_BOOTSOURCE_EEPROM - bool - help - Allow use of a serial eeprom as a boot source - -config BR2_BOOTSOURCE - bool - default y if BR2_BOOTSOURCE_DATAFLASHCARD - default y if BR2_BOOTSOURCE_DATAFLASH - default y if BR2_BOOTSOURCE_NANDFLASH - default y if BR2_BOOTSOURCE_FLASH - default y if BR2_BOOTSOURCE_SDCARD - default y if BR2_BOOTSOURCE_EEPROM
boot/u-boot/u-boot.mk +8 -105
174 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 16/46 u-boot: remove unused U_BOOT_TARGET_TOOLS variable
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
boot/u-boot/u-boot.mk +1 -2
@@ -30,7 +30,6 @@ U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc) U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h -U_BOOT_TARGET_TOOLS:= ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y) U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage endif
@@ -156,7 +155,7 @@ u-boot: $(U_BOOT_TARGETS) u-boot-clean: -$(MAKE) -C $(U_BOOT_DIR) clean - rm -f $(MKIMAGE) $(U_BOOT_TARGET_TOOLS) + rm -f $(MKIMAGE) u-boot-dirclean: rm -rf $(U_BOOT_DIR)
Signature · 1 line
1.7.0.4
PATCH 17/46 u-boot: add a few comments
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
boot/u-boot/u-boot.mk +8 -0
@@ -108,6 +108,7 @@ endif endif # BR2_TARGET_UBOOT_NETWORK touch $@ +# Build U-Boot itself $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \
@@ -116,10 +117,15 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \ -C $(U_BOOT_DIR) +# Copy the result to the images/ directory $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN) rm -f $(BINARIES_DIR)/$(U_BOOT_BIN) cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/ +# Build just mkimage for the host. It might have already been built by +# the U-Boot build procedure, but mkimage may also be needed even if +# U-Boot isn't selected in the configuration, to generate a kernel +# uImage. $(MKIMAGE): $(U_BOOT_DIR)/.configured mkdir -p $(@D) $(TARGET_CONFIGURE_OPTS) \
@@ -130,6 +136,7 @@ $(MKIMAGE): $(U_BOOT_DIR)/.configured -C $(U_BOOT_DIR) tools cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D) +# Build manually mkimage for the target $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured mkdir -p $(@D) $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
@@ -143,6 +150,7 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ +# Build manually fw_printenv for the target $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured mkdir -p $(@D) $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
Signature · 1 line
1.7.0.4
PATCH 18/46 u-boot: remove unneeded symbolic link + blank line
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/u-boot/u-boot.mk | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
boot/u-boot/u-boot.mk +0 -2
@@ -147,7 +147,6 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured $(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \ $(U_BOOT_DIR)/tools/os_support.c \ $(U_BOOT_DIR)/libfdt/fdt*.c - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ # Build manually fw_printenv for the target
@@ -157,7 +156,6 @@ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured -DUSE_HOSTCC -o $@ \ $(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/lib_generic/crc32.c $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ - ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv u-boot: $(U_BOOT_TARGETS)
Signature · 1 line
1.7.0.4
PATCH 18/46 u-boot: remove unneeded symbolic link + blank line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> boot/u-boot/u-boot.mk | 2 --
Thomas> 1 files changed, 0 insertions(+), 2 deletions(-)
Thomas> diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk Thomas> index bc03039..92fdc4c 100644
Thomas> --- a/boot/u-boot/u-boot.mk
Thomas> +++ b/boot/u-boot/u-boot.mk
Thomas> @@ -147,7 +147,6 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
Thomas> $(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \ Thomas> $(U_BOOT_DIR)/tools/os_support.c \ Thomas> $(U_BOOT_DIR)/libfdt/fdt*.c
Thomas> -
Thomas> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
Thomas> # Build manually fw_printenv for the target
Thomas> @@ -157,7 +156,6 @@ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
Thomas> -DUSE_HOSTCC -o $@ \ Thomas> $(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/lib_generic/crc32.c Thomas> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
Thomas> - ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
Why is this unneeded? The fw_setenv link is needed to be able to set parameters.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 18/46 u-boot: remove unneeded symbolic link + blank line
Quoted 5 lines · On Tue, 08 Jun 2010 23:53:16 +0200 Peter Korsgaard <[email protected]> wrote:
Thomas> $(STRIP_STRIP_UNNEEDED) $@
Thomas> - ln -sffw_printenv$(TARGET_DIR)/usr/sbin/fw_setenvWhy is this unneeded? The
fw_setenvlink is needed to be able to set parameters.
I misread: I thought it was fw_printenv twice. I've removed this commit.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 19/46 grub: remove GRUB_SUPPORTED_ARCH
In reply to Thomas Petazzonigrub can already only be selected for x86 and x86_64. No need to check again for this in grub.mk.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/grub/grub.mk | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-)
boot/grub/grub.mk +0 -19
@@ -1,20 +1,3 @@ -GRUB_SUPPORTED_ARCH=n -ifeq ($(ARCH),i386) -GRUB_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i486) -GRUB_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i586) -GRUB_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i686) -GRUB_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),x86_64) -GRUB_SUPPORTED_ARCH=y -endif -ifeq ($(GRUB_SUPPORTED_ARCH),y) ############################################################# # # grub
@@ -125,8 +108,6 @@ grub-clean: grub-dirclean: rm -rf $(GRUB_DIR) -endif - ############################################################# # # Toplevel Makefile options
Signature · 1 line
1.7.0.4
PATCH 20/46 grub2: remove GRUB2_ARCH_SUPPORTED
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/grub2/grub2.mk | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-)
boot/grub2/grub2.mk +0 -19
@@ -1,20 +1,3 @@ -GRUB2_SUPPORTED_ARCH=n -ifeq ($(ARCH),i386) -GRUB2_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i486) -GRUB2_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i586) -GRUB2_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i686) -GRUB2_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),x86_64) -GRUB2_SUPPORTED_ARCH=y -endif -ifeq ($(GRUB2_SUPPORTED_ARCH),y) ############################################################# # # grub2
@@ -122,8 +105,6 @@ grub2-clean: grub2-dirclean: rm -rf $(GRUB2_DIR) -endif - ############################################################# # # Toplevel Makefile options
Signature · 1 line
1.7.0.4
PATCH 21/46 grub/grub2: drop unnecessary dependency on uclibc
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/grub/grub.mk | 2 +- boot/grub2/grub2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
boot/grub/grub.mk +1 -1
@@ -96,7 +96,7 @@ ifeq ($(BR2_TARGET_GRUB_SPLASH),y) endif touch $@ -grub: uclibc $(GRUB_DIR)/.installed +grub: $(GRUB_DIR)/.installed grub-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall
boot/grub2/grub2.mk +1 -1
@@ -93,7 +93,7 @@ ifeq ($(BR2_TARGET_GRUB2_SPLASH),y) endif touch $@ -grub2: uclibc $(GRUB2_DIR)/.installed +grub2: $(GRUB2_DIR)/.installed grub2-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall
Signature · 1 line
1.7.0.4
PATCH 22/46 grub/grub2: update splash image location
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/grub/grub.mk | 2 +- boot/grub2/grub2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
boot/grub/grub.mk +1 -1
@@ -11,7 +11,7 @@ GRUB_CAT:=$(ZCAT) GRUB_DIR:=$(BUILD_DIR)/grub-0.97 GRUB_BINARY:=grub/grub GRUB_TARGET_BINARY:=sbin/grub -GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz +GRUB_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz GRUB_CFLAGS=-DSUPPORT_LOOPDEV
boot/grub2/grub2.mk +1 -1
@@ -11,7 +11,7 @@ GRUB2_CAT:=$(ZCAT) GRUB2_DIR:=$(BUILD_DIR)/grub-1.95 GRUB2_BINARY:=grub2/grub2 GRUB2_TARGET_BINARY:=sbin/grub2 -GRUB2_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz +GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
Signature · 1 line
1.7.0.4
PATCH 23/46 grub2: bump version
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/grub2/grub2.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
boot/grub2/grub2.mk +4 -4
@@ -3,12 +3,12 @@ # grub2 # ############################################################# -GRUB2_SOURCE:=grub2_1.95.orig.tar.gz -GRUB2_PATCH:=grub2_1.95-5.diff.gz +GRUB2_SOURCE:=grub2_1.98.orig.tar.gz +GRUB2_PATCH:=grub2_1.98-1.diff.gz GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2 -GRUB2_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2 +GRUB2_PATCH_SITE:=$(GRUB2_SITE) GRUB2_CAT:=$(ZCAT) -GRUB2_DIR:=$(BUILD_DIR)/grub-1.95 +GRUB2_DIR:=$(BUILD_DIR)/grub-1.98 GRUB2_BINARY:=grub2/grub2 GRUB2_TARGET_BINARY:=sbin/grub2 GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
Signature · 1 line
1.7.0.4
PATCH 24/46 grub2: fix build
In reply to Thomas Petazzonigrub2 now builds fine, but some work remains to make it usable. What should be installed exactly in the TARGET_DIR ? What is the installation procedure and what should Buildroot do ?
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/grub2/grub-1.95-001-fix-grub-install.patch | 23 ----------- boot/grub2/grub2.mk | 49 ++++++++++++---------- 2 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 boot/grub2/grub-1.95-001-fix-grub-install.patch
boot/grub2/grub-1.95-001-fix-grub-install.patch deleted +0 -23
@@ -1,23 +0,0 @@ -? config.status.lineno -? fix-grub-install.diff -? genkernsyms.sh -? gensymlist.sh -? grub-mkimage.d -? grub_script.tab.c -? grub_script.tab.h -? kernel_elf_symlist.c -Index: util/powerpc/ieee1275/grub-install.in -=================================================================== -RCS file: /cvsroot/grub/grub2/util/powerpc/ieee1275/grub-install.in,v -retrieving revision 1.5 -diff -u -r1.5 grub-install.in ---- grub-1.95/util/powerpc/ieee1275/grub-install.in 28 May 2006 23:01:43 -0000 1.5 -+++ grub-1.95/util/powerpc/ieee1275/grub-install.in 4 Mar 2007 19:05:47 -0000 -@@ -23,6 +23,7 @@ - # Initialize some variables. - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+bindir=@bindir@ - sbindir=@sbindir@ - libdir=@libdir@ - PACKAGE_NAME=@PACKAGE_NAME@
boot/grub2/grub2.mk +27 -22
95 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 24/46 grub2: fix build
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> grub2 now builds fine, but some work remains to make it usable. What Thomas> should be installed exactly in the TARGET_DIR ? What is the Thomas> installation procedure and what should Buildroot do ?
Sorry, don't know - Anyone using BR for x86?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 25/46 grub2: remove non-existing options
In reply to Thomas PetazzoniMuch of the grub2.mk seems to have been copy/pasted from grub.mk. However, all the network/splashimage related ./configure options do not exist in grub2.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/grub2/Config.in | 9 --------- boot/grub2/grub2.mk | 27 --------------------------- 2 files changed, 0 insertions(+), 36 deletions(-)
boot/grub2/Config.in +0 -9
@@ -2,12 +2,3 @@ config BR2_TARGET_GRUB2 bool "grub2" help The GRand Unified Bootloader for x86 systems, take #2. - -config BR2_TARGET_GRUB2_SPLASH - bool "Splashimage support" - depends on BR2_TARGET_GRUB2 - help - Add support for splashimage. - - A splashimage is a 14-color indexed .xpm picture which - is displayed as background for the grub menu.
boot/grub2/grub2.mk +0 -27
@@ -18,39 +18,12 @@ GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2 GRUB2_PATCH_SITE:=$(GRUB2_SITE) GRUB2_CAT:=$(ZCAT) GRUB2_DIR:=$(BUILD_DIR)/grub-1.98 -GRUB2_BINARY:=grub2/grub2 -GRUB2_TARGET_BINARY:=sbin/grub2 -GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz GRUB2_CFLAGS=-DSUPPORT_LOOPDEV ifeq ($(BR2_LARGEFILE),) GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS endif -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c90x) += --enable-3c90x -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_davicom) += --enable-davicom -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_e1000) += --enable-e1000 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_eepro100) += --enable-eepro100 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_epic100) += --enable-epic100 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_forcedeth) += --enable-forcedeth -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_natsemi) += --enable-natsemi -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns83820) += --enable-ns83820 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns8390) += --enable-ns8390 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pcnet32) += --enable-pcnet32 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pnic) += --enable-pnic -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_rtl8139) += --enable-rtl8139 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_r8169) += --enable-r8169 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_sis900) += --enable-sis900 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tg3) += --enable-tg3 -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tulip) += --enable-tulip -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tlan) += --enable-tlan -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_undi) += --enable-undi -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine -GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840 - $(DL_DIR)/$(GRUB2_SOURCE): $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
Signature · 1 line
1.7.0.4
PATCH 26/46 grub2: only available on x86 and PowerPC and mark as BROKEN
In reply to Thomas PetazzoniThe build process of grub2 breaks the compilation. It breaks with:
./configure: line 4766: syntax error near unexpected token external' ./configure: line 4766: AM_GNU_GETTEXT(external)'
In addition to this, it later requires Ruby. Do we really want to make Buildroot depend on Ruby being installed on the host ? Do we really want to build our own Ruby ? Do we even care about Grub2 ?
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/grub2/Config.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
boot/grub2/Config.in +5 -0
@@ -1,4 +1,9 @@ config BR2_TARGET_GRUB2 bool "grub2" + # Only supports PC, Mac (Power, x86 and x86-64), Pegasos + depends on BR2_i386 || BR2_powerpc + # Build process is broken (./configure doesn't work, Ruby + # required, etc.) + depends on BROKEN help The GRand Unified Bootloader for x86 systems, take #2.
Signature · 1 line
1.7.0.4
PATCH 26/46 grub2: only available on x86 and PowerPC and mark as BROKEN
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> The build process of grub2 breaks the compilation. It breaks with:
Thomas> ./configure: line 4766: syntax error near unexpected token external' Thomas> ./configure: line 4766: AM_GNU_GETTEXT(external)'
Thomas> In addition to this, it later requires Ruby. Do we really want to make Thomas> Buildroot depend on Ruby being installed on the host ? Do we really Thomas> want to build our own Ruby ? Do we even care about Grub2 ?
I would guess not as no one has complained.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 27/46 syslinux: bump version and fix build
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/syslinux/syslinux-3.82-makefile.patch | 11 ---------- boot/syslinux/syslinux-3.85-makefile.patch | 17 +++++++++++++++ boot/syslinux/syslinux.mk | 30 +++++++++++++++------------ 3 files changed, 34 insertions(+), 24 deletions(-) delete mode 100644 boot/syslinux/syslinux-3.82-makefile.patch create mode 100644 boot/syslinux/syslinux-3.85-makefile.patch
boot/syslinux/syslinux-3.82-makefile.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- syslinux-3.82-org/Makefile 2009-09-17 13:11:23.000000000 +0200 -+++ syslinux-3.82/Makefile 2009-09-17 13:13:32.000000000 +0200 -@@ -42,7 +42,7 @@ - mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \ - mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \ - core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ -- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \ -+ gpxe/gpxelinux.0 dos/syslinux.com \ - $(MODULES) - - # BSUBDIRs build the on-target binary components.
boot/syslinux/syslinux-3.85-makefile.patch new file +17 -0
@@ -0,0 +1,17 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: syslinux-3.85/Makefile +=================================================================== +--- syslinux-3.85.orig/Makefile ++++ syslinux-3.85/Makefile +@@ -43,7 +43,7 @@ + mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \ + mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \ + core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ +- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \ ++ gpxe/gpxelinux.0 dos/syslinux.com \ + dosutil/*.com dosutil/*.sys \ + $(MODULES) +
boot/syslinux/syslinux.mk +17 -13
@@ -22,34 +22,38 @@ ifeq ($(SYSLINUX_SUPPORTED_ARCH),y) # ############################################################# -SYSLINUX_VERSION:=3.82 +SYSLINUX_VERSION:=3.85 SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION) -SYSLINUX_DIR2=$(TOOLCHAIN_DIR)/syslinux-$(SYSLINUX_VERSION) SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2 SYSLINUX_CAT:=$(BZCAT) -SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/ -SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux - +SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/ $(DL_DIR)/$(SYSLINUX_SOURCE): $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE)) syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE) -$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH) - $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(SYSLINUX_DIR) boot/syslinux/ \*.patch +$(SYSLINUX_DIR)/.unpacked: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH) + mkdir -p $(@D) + $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(@D) boot/syslinux/ \*.patch touch -c $@ -$(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile - $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR) +$(SYSLINUX_DIR)/.compiled: $(SYSLINUX_DIR)/.unpacked + $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR) touch -c $@ -syslinux: $(SYSLINUX_DIR)/isolinux.bin -pxelinux: $(SYSLINUX_DIR)/pxelinux.bin +$(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled + cp -a $(SYSLINUX_DIR)/core/isolinux.bin $@ + +$(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled + cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@ + +syslinux: $(BINARIES_DIR)/isolinux.bin +pxelinux: $(BINARIES_DIR)/pxelinux.bin pxelinux-clean syslinux-clean: - rm -f $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin + rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin -$(MAKE) -C $(SYSLINUX_DIR) clean pxelinux-dirclean syslinux-dirclean:
Signature · 1 line
1.7.0.4
PATCH 28/46 syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/syslinux/syslinux.mk | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-)
boot/syslinux/syslinux.mk +0 -20
@@ -1,21 +1,3 @@ -SYSLINUX_SUPPORTED_ARCH=n -ifeq ($(ARCH),i386) -SYSLINUX_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i486) -SYSLINUX_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i586) -SYSLINUX_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),i686) -SYSLINUX_SUPPORTED_ARCH=y -endif -ifeq ($(ARCH),x86_64) -SYSLINUX_SUPPORTED_ARCH=y -endif -ifeq ($(SYSLINUX_SUPPORTED_ARCH),y) - ############################################################# # # syslinux to make target msdos/iso9660 filesystems bootable
@@ -59,8 +41,6 @@ pxelinux-clean syslinux-clean: pxelinux-dirclean syslinux-dirclean: rm -rf $(SYSLINUX_DIR) -endif - ############################################################# # # Toplevel Makefile options
Signature · 1 line
1.7.0.4
PATCH 29/46 nasm: new package, needed for syslinux
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- package/nasm/nasm.mk | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 package/nasm/nasm.mk
package/nasm/nasm.mk new file +19 -0
@@ -0,0 +1,19 @@ +############################################################ +# +# nasm +# +# This is special case: nasm is used to build syslinux and +# pxelinux. As these are for the target, we should cross-compile +# nasm. However, as nasm is x86-only, there's no point in +# cross-compiling it. So we just build it for the host. The target +# variant is only provided because of a bug in the package +# infrastructure that prevents having only a host variant. +############################################################ + +NASM_VERSION=2.08.01 +NASM_SOURCE=nasm-$(NASM_VERSION).tar.bz2 +NASM_SITE=http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/ +NASM_LIBTOOL_PATCH=NO + +$(eval $(call AUTOTARGETS,package,nasm)) +$(eval $(call AUTOTARGETS,package,nasm,host))
Signature · 1 line
1.7.0.4
PATCH 30/46 syslinux: depends on host-nasm
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/syslinux/syslinux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
boot/syslinux/syslinux.mk +2 -2
@@ -31,8 +31,8 @@ $(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled $(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@ -syslinux: $(BINARIES_DIR)/isolinux.bin -pxelinux: $(BINARIES_DIR)/pxelinux.bin +syslinux: host-nasm $(BINARIES_DIR)/isolinux.bin +pxelinux: host-nasm $(BINARIES_DIR)/pxelinux.bin pxelinux-clean syslinux-clean: rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin
Signature · 1 line
1.7.0.4
PATCH 31/46 at91bootstrap: do not default to $(BOARD_NAME)
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/Config.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
boot/at91bootstrap/Config.in +1 -1
@@ -6,7 +6,7 @@ if BR2_TARGET_AT91BOOTSTRAP config BR2_TARGET_AT91BOOTSTRAP_BOARD string "Bootstrap board" - default "$(BOARD_NAME)" + default "" help This is used to do a make <board>_config
Signature · 1 line
1.7.0.4
PATCH 32/46 at91bootstrap: simplify configuration
In reply to Thomas PetazzoniThere no need to depends on BR2_TARGET_AT91BOOTSTRAP when the configuration options are already inside a if BR2_TARGET_AT91BOOTSTRAP.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/Config.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
boot/at91bootstrap/Config.in +0 -8
@@ -13,7 +13,6 @@ config BR2_TARGET_AT91BOOTSTRAP_BOARD choice prompt "Boot Memory" default BR2_TARGET_AT91BOOT_DATAFLASHCARD - depends on BR2_TARGET_AT91BOOTSTRAP help Select Chip for which AT91 bootstrap should be built
@@ -45,7 +44,6 @@ endchoice config BR2_TARGET_AT91BOOTSTRAP_MEMORY string - depends on BR2_TARGET_AT91BOOTSTRAP default "dataflash" if BR2_TARGET_AT91BOOT_DATAFLASH default "dataflashcard" if BR2_TARGET_AT91BOOT_DATAFLASHCARD default "nandflash" if BR2_TARGET_AT91BOOT_NANDFLASH
@@ -55,7 +53,6 @@ config BR2_TARGET_AT91BOOTSTRAP_MEMORY config BR2_AT91BOOTSTRAP_IMG_SIZE string "Image Size to copy to SDRAM" - depends on BR2_TARGET_AT91BOOTSTRAP default "0x32000" if BR2_TARGET_AT91BOOT_DATAFLASH default "0x32000" if BR2_TARGET_AT91BOOT_DATAFLASHCARD default "0x30000" if BR2_TARGET_AT91BOOT_NANDFLASH
@@ -69,7 +66,6 @@ config BR2_AT91BOOTSTRAP_IMG_SIZE choice prompt "Start address of application" default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT - depends on BR2_TARGET_AT91BOOTSTRAP help Select Chip for which AT91 bootstrap should be built Currently supports AT91SAM9260EK, AT91SAM9261EK,
@@ -97,10 +93,6 @@ config BR2_AT91BOOTSTRAP_JUMP_ADDR default "0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT default "0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM default "0x20000000" if BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM - depends on BR2_TARGET_AT91BOOTSTRAP - -comment "It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)" - depends on BR2_TARGET_AT91BOOTSTRAP endif
Signature · 1 line
1.7.0.4
PATCH 33/46 at91bootstrap: fix the boot source selection
In reply to Thomas PetazzoniThe boot source configuration options were depending on U-Boot configuration options. Let's make it independent and just allow the user to select whichever boot source is appropriate.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/Config.in | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
boot/at91bootstrap/Config.in +0 -6
@@ -18,27 +18,21 @@ choice config BR2_TARGET_AT91BOOT_DATAFLASH bool "AT45 Dataflash" - depends on BR2_BOOTSOURCE_DATAFLASH config BR2_TARGET_AT91BOOT_DATAFLASHCARD bool "AT45 Dataflash Card" - depends on BR2_BOOTSOURCE_DATAFLASHCARD config BR2_TARGET_AT91BOOT_NANDFLASH bool "NAND Flash" - depends on BR2_BOOTSOURCE_NANDFLASH config BR2_TARGET_AT91BOOT_FLASH bool "Internal Flash or external parallel flash" - depends on BR2_BOOTSOURCE_FLASH config BR2_TARGET_AT91BOOT_SDCARD bool "SD-Card" - depends on BR2_BOOTSOURCE_SDCARD config BR2_TARGET_AT91BOOT_EEPROM bool "EEPROM" - depends on BR2_BOOTSOURCE_EEPROM endchoice
Signature · 1 line
1.7.0.4
PATCH 34/46 at91bootstrap: fix incorrect config option comment
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/Config.in | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
boot/at91bootstrap/Config.in +1 -4
@@ -61,10 +61,7 @@ choice prompt "Start address of application" default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT help - Select Chip for which AT91 bootstrap should be built - Currently supports AT91SAM9260EK, AT91SAM9261EK, - AT91SAM9XEEK, AT91SAM9263EK - + Location of the application start address config BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT bool "Copy to the default U-Boot start location in the SDRAM"
Signature · 1 line
1.7.0.4
PATCH 35/46 at91bootstrap: remove unused/useless code
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +0 -12
@@ -50,8 +50,6 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config $(AT91BOOTSTRAP_BOARD)_defconfig touch $(AT91BOOTSTRAP_DIR)/.configured -# $(BOARD_NAME)_defconfig - $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(MAKE) \ MEMORY=$(AT91BOOTSTRAP_MEMORY) \
@@ -61,19 +59,13 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET) mkdir -p $(BINARIES_DIR) -ifeq ($(AT91BOOTSTRAP_VERSION),2.3) - cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) -else make MEMORY=$(AT91BOOTSTRAP_MEMORY) \ CROSS_COMPILE=$(TARGET_CROSS) \ -C $(AT91BOOTSTRAP_DIR) boot make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \ echo "Could not copy bootstrap to BINARIES_DIR" -endif touch $@ -# cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) - .PHONY: at91bootstrap at91bootstrap-source at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed
@@ -97,8 +89,4 @@ at91bootstrap-dirclean: ############################################################# ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y) TARGETS+=at91bootstrap -endif - -at91bootstrap-status: - @echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
Signature · 1 line
1.7.0.4
PATCH 36/46 at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +5 -0
@@ -90,3 +90,8 @@ at91bootstrap-dirclean: ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y) TARGETS+=at91bootstrap +# we NEED a board name +ifeq ($(AT91BOOTSTRAP_BOARD),) +$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting) +endif +endif
Signature · 1 line
1.7.0.4
PATCH 37/46 at91bootstrap: bump version to 2.13
In reply to Thomas PetazzoniAt the same time, remove the unused AT91BOOTSTRAP_PATCH_LEVEL and AT91BOOTSTRAP_PATCHED_VERSION variables.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +2 -4
@@ -3,9 +3,7 @@ # at91bootstrap # ############################################################# -AT91BOOTSTRAP_VERSION:=2.10 -AT91BOOTSTRAP_PATCH_LEVEL:= -AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL) +AT91BOOTSTRAP_VERSION:=2.13 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
@@ -18,7 +16,7 @@ AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) -AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin +AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
Signature · 1 line
1.7.0.4
PATCH 38/46 at91bootstrap: don't use the ATMEL_MIRROR thing
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +1 -2
@@ -5,8 +5,7 @@ ############################################################# AT91BOOTSTRAP_VERSION:=2.13 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) -AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR) +AT91BOOTSTRAP_SITE:=ftp://www.at91.com/pub/buildroot/ AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME) AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
Signature · 1 line
1.7.0.4
PATCH 39/46 at91bootstrap: fix install procedure
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +4 -5
@@ -56,11 +56,10 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET) mkdir -p $(BINARIES_DIR) - make MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - -C $(AT91BOOTSTRAP_DIR) boot - make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \ - echo "Could not copy bootstrap to BINARIES_DIR" + make MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + DESTDIR=$(BINARIES_DIR) \ + -C $(AT91BOOTSTRAP_DIR) install touch $@ .PHONY: at91bootstrap at91bootstrap-source
Signature · 1 line
1.7.0.4
PATCH 40/46 at91bootstrap: fix AT91BOOTSTRAP_BINARY
In reply to Thomas PetazzoniUse AT91BOOTSTRAP_BOARD instead of BOARD_NAME. Remove AT91BOOTSTRAP_VERSION from the final binary image name.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/at91bootstrap/at91bootstrap.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +1 -5
@@ -12,13 +12,9 @@ AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP)) AT91BOOTSTRAP_ZCAT:=$(BZCAT) AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) - AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) - -AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin - +AT91BOOTSTRAP_BINARY:=$(AT91BOOTSTRAP_BOARD)-$(AT91BOOTSTRAP_MEMORY)boot.bin AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY) - AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR)) AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE))
Signature · 1 line
1.7.0.4
PATCH 41/46 at91dataflashboot: fix configuration options
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91dataflashboot/Config.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
boot/at91dataflashboot/Config.in +6 -4
@@ -2,22 +2,24 @@ menuconfig BR2_TARGET_DATAFLASHBOOT depends on BR2_arm bool "AT91 DataFlashBoot" +if BR2_TARGET_DATAFLASHBOOT + choice prompt "Target Architecture" default BR2_TARGET_DATAFLASHBOOT_AT91RM9200 - depends on BR2_TARGET_DATAFLASHBOOT help Select Chip for which Dataflash boot should be built Currently only AT91RM9200 Supported config BR2_TARGET_DATAFLASHBOOT_AT91RM9200 - depends on BR2_TARGET_AT91RM9200 bool "AT91RM9200" + config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261 - depends on BR2_TARGET_AT91SAM9261 bool "AT91SAM9261" + config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261S - depends on BR2_TARGET_AT91SAM9261S bool "AT91SAM9261S" endchoice + +endif # BR2_TARGET_DATAFLASHBOOT
Signature · 1 line
1.7.0.4
PATCH 42/46 at91dataflashboot: various fixes
In reply to Thomas PetazzoniFix the URL, fix the directory to which it gets unpacked, fix make target names to be lower-case only.
Signed-off-by Thomas Petazzoni <[email protected]>
--- boot/at91dataflashboot/at91dataflashboot.mk | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
boot/at91dataflashboot/at91dataflashboot.mk +6 -8
@@ -5,29 +5,27 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) -DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR) +DATAFLASHBOOT_SITE:=ftp://www.at91.com/pub/buildroot/ DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 -DATAFLASHBOOT_DIR:=$(BUILD_DIR)/$(DATAFLASHBOOT_NAME) +DATAFLASHBOOT_DIR:=$(BUILD_DIR)/at91dataflashboot-$(DATAFLASHBOOT_VERSION) DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin $(DL_DIR)/$(DATAFLASHBOOT_SOURCE): $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE)) $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) - mkdir -p $(BUILD_DIR) - ls $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) - $(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + mkdir -p $(@D) + $(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - touch $(DATAFLASHBOOT_DIR)/.unpacked $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked ls $(DATAFLASHBOOT_DIR)/.unpacked make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS) -DataflashBoot-clean: +dataflashboot-clean: make -C $(DATAFLASHBOOT_DIR) clean -DataflashBoot-dirclean: +dataflashboot-dirclean: rm -rf $(DATAFLASHBOOT_DIR) dataflash: $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
Signature · 1 line
1.7.0.4
PATCH 43/46 at91dataflashboot: add a patch step
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/at91dataflashboot/at91dataflashboot.mk | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
boot/at91dataflashboot/at91dataflashboot.mk +5 -1
@@ -18,7 +18,11 @@ $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) $(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - touch $(DATAFLASHBOOT_DIR)/.unpacked -$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked +$(DATAFLASHBOOT_DIR)/.patched: $(DATAFLASHBOOT_DIR)/.unpacked + toolchain/patch-kernel.sh $(@D) boot/at91dataflashboot \ + at91dataflashboot-$(DATAFLASHBOOT_VERSION)-\*.patch + +$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.patched ls $(DATAFLASHBOOT_DIR)/.unpacked make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
Signature · 1 line
1.7.0.4
PATCH 44/46 at91dataflashboot: add two patches
In reply to Thomas PetazzoniThe first patch allows to build with an EABI toolchain. The second patch disables the install step of at91dataflashboot Makefile since it tries to copy files to /tftpboot.
Signed-off-by Thomas Petazzoni <[email protected]>
--- .../at91dataflashboot-1.05-do-not-install.patch | 22 ++++++++++ .../at91dataflashboot-1.05-eabi-fixes.patch | 43 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch create mode 100644 boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch
boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch new file +22 -0
@@ -0,0 +1,22 @@ +Disable the automatic installation of at91dataflashboot since it tries +to install things to /tftpboot, which is not possible when not +building as root. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: at91dataflashboot-1.05/Makefile +=================================================================== +--- at91dataflashboot-1.05.orig/Makefile ++++ at91dataflashboot-1.05/Makefile +@@ -40,7 +40,7 @@ + + I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h + +-all: clean $(BINNAME) $(LSSNAME) install ++all: clean $(BINNAME) $(LSSNAME) + $(SIZE) $(OUTNAME) + + # C objects here
boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 45/46 defconfigs: remove references to old U-Boot versions
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- configs/at91rm9200df_defconfig | 2 -- configs/at91rm9200df_ext_defconfig | 2 -- configs/at91sam9260dfc_defconfig | 2 -- configs/at91sam9260dfc_ext_defconfig | 2 -- configs/at91sam9261ek_defconfig | 2 -- configs/at91sam9261ek_ext_defconfig | 2 -- configs/at91sam9263ek_defconfig | 2 -- configs/at91sam9263ek_ext_defconfig | 2 -- configs/at91sam9g20dfc_defconfig | 2 -- configs/at91sam9g20dfc_ext_defconfig | 2 -- configs/atngw100-base_defconfig | 2 -- configs/atngw100_defconfig | 5 ----- configs/atstk1005_defconfig | 2 -- configs/atstk100x_defconfig | 2 -- configs/integrator926_defconfig | 2 -- configs/integrator926_huge_defconfig | 2 -- 16 files changed, 0 insertions(+), 35 deletions(-)
configs/at91rm9200df_defconfig +0 -2
@@ -883,8 +883,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91rm9200df_ext_defconfig +0 -2
@@ -809,8 +809,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9260dfc_defconfig +0 -2
@@ -897,8 +897,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9260dfc_ext_defconfig +0 -2
@@ -817,8 +817,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9261ek_defconfig +0 -2
@@ -949,8 +949,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9261ek_ext_defconfig +0 -2
@@ -906,8 +906,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9263ek_defconfig +0 -2
@@ -946,8 +946,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9263ek_ext_defconfig +0 -2
@@ -868,8 +868,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9g20dfc_defconfig +0 -2
@@ -813,8 +813,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/at91sam9g20dfc_ext_defconfig +0 -2
@@ -817,8 +817,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" BR2_TARGET_U_BOOT_ARCH_PATCH=y
configs/atngw100-base_defconfig +0 -2
@@ -739,8 +739,6 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100" # BR2_TARGET_UBOOT_2009_03 is not set # BR2_TARGET_UBOOT_2009_01 is not set BR2_TARGET_UBOOT_2008_10=y -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2008.10" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
configs/atngw100_defconfig +0 -5
@@ -740,11 +740,6 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100" # BR2_TARGET_UBOOT_2010_03 is not set # BR2_TARGET_UBOOT_2009_11 is not set BR2_TARGET_UBOOT_2009_08=y -# BR2_TARGET_UBOOT_2009_06 is not set -# BR2_TARGET_UBOOT_2009_03 is not set -# BR2_TARGET_UBOOT_2009_01 is not set -# BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.08" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
configs/atstk1005_defconfig +0 -2
@@ -771,8 +771,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="atngw100" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
configs/atstk100x_defconfig +0 -2
@@ -868,8 +868,6 @@ BR2_TARGET_UBOOT_BOARDNAME="atstk1002" # BR2_TARGET_UBOOT_2009_03 is not set # BR2_TARGET_UBOOT_2009_01 is not set BR2_TARGET_UBOOT_2008_10=y -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2008.10" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
configs/integrator926_defconfig +0 -2
@@ -706,8 +706,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="cp926ejs" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
configs/integrator926_huge_defconfig +0 -2
@@ -682,8 +682,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="cp926ejs" BR2_TARGET_UBOOT_2009_01=y # BR2_TARGET_UBOOT_2008_10 is not set -# BR2_TARGET_UBOOT_1_3_4 is not set -# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set BR2_UBOOT_VERSION="2009.01" BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot" # BR2_TARGET_U_BOOT_ARCH_PATCH is not set
Signature · 1 line
1.7.0.4
PATCH 46/46 Add support for the Barebox bootloader
In reply to Thomas PetazzoniSigned-off-by Thomas Petazzoni <[email protected]>
--- boot/Config.in | 1 + boot/barebox/Config.in | 14 ++++++++++ boot/barebox/barebox.mk | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 boot/barebox/Config.in create mode 100644 boot/barebox/barebox.mk
boot/Config.in +1 -0
@@ -1,5 +1,6 @@ menu "Bootloaders" +source "boot/barebox/Config.in" source "boot/grub/Config.in" source "boot/grub2/Config.in" source "boot/syslinux/Config.in"
boot/barebox/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +menuconfig BR2_TARGET_BAREBOX + bool "Barebox" + help + The Barebox bootloader, formerly known as U-Boot v2. + + http://www.barebox.org + +if BR2_TARGET_BAREBOX +config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG + string "board defconfig" + help + Name of the board for which Barebox should be built, without + the _defconfig suffix. +endif
boot/barebox/barebox.mk new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 46/46 Add support for the Barebox bootloader
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hi,
Thomas> +############################################################# Thomas> +#
Thomas> +# Barebox
Thomas> +#
Thomas> +############################################################# Thomas> +
Thomas> +BAREBOX_VERSION:=2010.05.0
Thomas> +BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2
Thomas> +BAREBOX_SITE:=http://www.barebox.org/download/
Thomas> +BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION)
Thomas> +BAREBOX_CAT:=$(BZCAT)
Thomas> +BAREBOX_BOARD_DEFCONFIG:=$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG)) Thomas> +
Thomas> +ifeq ($(ARCH),i386)
Thomas> +BAREBOX_ARCH=x86
Thomas> +else ifeq ($(ARCH),powerpc)
Thomas> +BAREBOX_ARCH=ppc
Thomas> +else
Thomas> +BAREBOX_ARCH=$(ARCH)
Thomas> +endif
This should afaik use KERNEL_ARCH rather than arch (E.G. with i?x86 converted into i386) - Similar to how it's done for u-boot.
Thomas> +
Thomas> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE=$(TARGET_CROSS) Thomas> +
Thomas> +$(DL_DIR)/$(BAREBOX_SOURCE):
Thomas> + $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE))
Thomas> +
Thomas> +$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE)
Thomas> + $(BAREBOX_CAT) $(DL_DIR)/$(BAREBOX_SOURCE) \
Thomas> + | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
Thomas> + mkdir -p $(BAREBOX_DIR)
What's the point of that mkdir?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 46/46 Add support for the Barebox bootloader
Quoted 2 lines · On Wed, 09 Jun 2010 09:51:03 +0200 Peter Korsgaard <[email protected]> wrote:
This should afaik use
KERNEL_ARCHrather than arch (E.G. with i?x86 converted into i386) - Similar to how it's done for u-boot.
Ok, done.
Quoted 11 lines
Thomas> +
Thomas> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) Thomas> CROSS_COMPILE=$(TARGET_CROSS) +
Thomas> +$(DL_DIR)/$(BAREBOX_SOURCE):
Thomas> + $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE))
Thomas> +
Thomas> +$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE)
Thomas> + $(BAREBOX_CAT) $(DL_DIR)/$(BAREBOX_SOURCE) \
Thomas> + | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
Thomas> + mkdir -p $(BAREBOX_DIR)
Quoted 1 line
What's the point of that mkdir?
No point, and I've switched to the "strip one component path" method that we use for most/all packages.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Hello,
Since I posted this patch set (on June, 1st), the only comment was the one from Paul Jones about U-Boot version flexibility, to which I answered today with an improved proposal.
Are there any other comments that would prevent this patch set from beign merged ? Should I resend the complete patch set again ?
Regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com