* [Buildroot] [pull request] Pull request for branch bootloaders-cleanup
@ 2010-06-12 14:21 Thomas Petazzoni
2010-06-12 14:21 ` [Buildroot] [PATCH 01/49] bootloaders: move bootloader build code to boot/ Thomas Petazzoni
` (48 more replies)
0 siblings, 49 replies; 53+ messages in thread
From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw)
To: buildroot
Hello,
Here is a new try (hopefully the last) at getting this
bootloaders-cleanup branch merged. Since the last post (June, 1st),
the changes are :
* Added the ability to specify a custom tarball for U-Boot, as
requested by Paul Jones. Initially, I added three options: latest
U-Boot version, custom U-Boot stable official version, custom
tarball. However, Peter Korsgaard disagreed with this "latest
U-Boot version", so now we have the choice between a small set of
U-Boot official stable versions or the custom tarball options.
* Fixed how mkimage is built for the host: configuring U-Boot is no
longer a pre-requisite, and the build process of mkimage has been
simplified.
* Use KERNEL_ARCH in Barebox and fix how the Barebox tarball was
extracted.
* More cleanup in the defconfig files regarding U-Boot related
options
Thomas
The following changes since commit 7c709f4affc44f3bbc9a09fec8d84ae3807e31e7:
Peter Korsgaard (1):
file: don't force _GNU_SOURCE in CFLAGS
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot bootloaders-cleanup
Thomas Petazzoni (49):
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: re-add infrastructure to specify custom tarball
u-boot: beautify option prompts
u-boot: use BR2_TARGET_UBOOT_VERSION instead of BR2_UBOOT_VERSION
defconfigs: remove references to old U-Boot versions
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
Add support for the Barebox bootloader
linux: fix dependency on mkimage
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 | 112 +++
boot/u-boot/u-boot.mk | 193 +++++
configs/at91rm9200df_defconfig | 25 +-
configs/at91rm9200df_ext_defconfig | 25 +-
configs/at91sam9260dfc_defconfig | 25 +-
configs/at91sam9260dfc_ext_defconfig | 25 +-
configs/at91sam9261ek_defconfig | 25 +-
configs/at91sam9261ek_ext_defconfig | 25 +-
configs/at91sam9263ek_defconfig | 25 +-
configs/at91sam9263ek_ext_defconfig | 25 +-
configs/at91sam9g20dfc_defconfig | 25 +-
configs/at91sam9g20dfc_ext_defconfig | 25 +-
configs/atngw100-base_defconfig | 8 +-
configs/atngw100_defconfig | 27 +-
configs/atstk1005_defconfig | 8 +-
configs/atstk100x_defconfig | 8 +-
configs/integrator926_defconfig | 8 +-
configs/integrator926_huge_defconfig | 8 +-
configs/v100sc2_defconfig | 3 +-
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/linux/Config.in.advanced | 1 -
target/linux/Makefile.in.advanced | 4 +-
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 --
80 files changed, 714 insertions(+), 5640 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.mk
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 53+ messages in thread* [Buildroot] [PATCH 01/49] bootloaders: move bootloader build code to boot/ 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 02/49] yaboot: drop support Thomas Petazzoni ` (47 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- 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.in diff --git a/Config.in b/Config.in index 435d4bd..f5eb859 100644 --- a/Config.in +++ b/Config.in @@ -293,4 +293,6 @@ source "package/Config.in" source "fs/Config.in" +source "boot/Config.in" + source "target/Config.in" diff --git a/Makefile b/Makefile index 68732fa..67e41ae 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/boot/Config.in b/boot/Config.in new file mode 100644 index 0000000..6f2796f --- /dev/null +++ b/boot/Config.in @@ -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 + diff --git a/target/device/Atmel/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in similarity index 92% rename from target/device/Atmel/at91bootstrap/Config.in rename to boot/at91bootstrap/Config.in index 91e0b08..44db8f5 100644 --- a/target/device/Atmel/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -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 diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk similarity index 96% rename from target/device/Atmel/at91bootstrap/at91bootstrap.mk rename to boot/at91bootstrap/at91bootstrap.mk index f681fa9..2072c6b 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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 diff --git a/target/device/Atmel/DataFlashBoot/Config.in b/boot/at91dataflashboot/Config.in similarity index 76% rename from target/device/Atmel/DataFlashBoot/Config.in rename to boot/at91dataflashboot/Config.in index 1da5e62..c6711c4 100644 --- a/target/device/Atmel/DataFlashBoot/Config.in +++ b/boot/at91dataflashboot/Config.in @@ -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" diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/boot/at91dataflashboot/at91dataflashboot.mk similarity index 100% rename from target/device/Atmel/DataFlashBoot/DataflashBoot.mk rename to boot/at91dataflashboot/at91dataflashboot.mk diff --git a/boot/common.mk b/boot/common.mk new file mode 100644 index 0000000..dc0bfb4 --- /dev/null +++ b/boot/common.mk @@ -0,0 +1 @@ +include boot/*/*.mk \ No newline at end of file diff --git a/target/x86/grub/Config.in b/boot/grub/Config.in similarity index 100% rename from target/x86/grub/Config.in rename to boot/grub/Config.in diff --git a/target/x86/grub/grub.100-autoreconf.patch b/boot/grub/grub.100-autoreconf.patch similarity index 100% rename from target/x86/grub/grub.100-autoreconf.patch rename to boot/grub/grub.100-autoreconf.patch diff --git a/target/x86/grub/grub.200-fix_mbr_handling.patch b/boot/grub/grub.200-fix_mbr_handling.patch similarity index 100% rename from target/x86/grub/grub.200-fix_mbr_handling.patch rename to boot/grub/grub.200-fix_mbr_handling.patch diff --git a/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch b/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch similarity index 100% rename from target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch rename to boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch diff --git a/target/x86/grub/grub.mk b/boot/grub/grub.mk similarity index 98% rename from target/x86/grub/grub.mk rename to boot/grub/grub.mk index af46244..80f9b6d 100644 --- a/target/x86/grub/grub.mk +++ b/boot/grub/grub.mk @@ -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 diff --git a/target/x86/grub/menu.lst b/boot/grub/menu.lst similarity index 100% rename from target/x86/grub/menu.lst rename to boot/grub/menu.lst diff --git a/target/x86/grub2/Config.in b/boot/grub2/Config.in similarity index 100% rename from target/x86/grub2/Config.in rename to boot/grub2/Config.in diff --git a/target/x86/grub2/grub-1.95-001-fix-grub-install.patch b/boot/grub2/grub-1.95-001-fix-grub-install.patch similarity index 100% rename from target/x86/grub2/grub-1.95-001-fix-grub-install.patch rename to boot/grub2/grub-1.95-001-fix-grub-install.patch diff --git a/target/x86/grub2/grub2.mk b/boot/grub2/grub2.mk similarity index 98% rename from target/x86/grub2/grub2.mk rename to boot/grub2/grub2.mk index 46c6471..119397b 100644 --- a/target/x86/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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 diff --git a/target/x86/syslinux/Config.in b/boot/syslinux/Config.in similarity index 100% rename from target/x86/syslinux/Config.in rename to boot/syslinux/Config.in diff --git a/target/x86/syslinux/syslinux-3.82-makefile.patch b/boot/syslinux/syslinux-3.82-makefile.patch similarity index 100% rename from target/x86/syslinux/syslinux-3.82-makefile.patch rename to boot/syslinux/syslinux-3.82-makefile.patch diff --git a/target/x86/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk similarity index 96% rename from target/x86/syslinux/syslinux.mk rename to boot/syslinux/syslinux.mk index 75d4ad4..df27b6d 100644 --- a/target/x86/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -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 diff --git a/target/u-boot/Config.in b/boot/u-boot/Config.in similarity index 100% rename from target/u-boot/Config.in rename to boot/u-boot/Config.in diff --git a/target/u-boot/Makefile.in b/boot/u-boot/Makefile.in similarity index 99% rename from target/u-boot/Makefile.in rename to boot/u-boot/Makefile.in index d1bb5e5..a875f2b 100644 --- a/target/u-boot/Makefile.in +++ b/boot/u-boot/Makefile.in @@ -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)),) diff --git a/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 similarity index 100% rename from target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 rename to boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 diff --git a/target/powerpc/yaboot/Config.in b/boot/yaboot/Config.in similarity index 100% rename from target/powerpc/yaboot/Config.in rename to boot/yaboot/Config.in diff --git a/target/powerpc/yaboot/yaboot.mk b/boot/yaboot/yaboot.mk similarity index 100% rename from target/powerpc/yaboot/yaboot.mk rename to boot/yaboot/yaboot.mk diff --git a/target/Config.in b/target/Config.in index 5d53635..2d96793 100644 --- a/target/Config.in +++ b/target/Config.in @@ -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" diff --git a/target/Makefile.in b/target/Makefile.in index ffcdbb6..8feb564 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -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. diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in index 4e36b90..870c537 100644 --- a/target/device/Atmel/Config.in +++ b/target/device/Atmel/Config.in @@ -66,8 +66,4 @@ config BR2_BOARD_PATH endmenu -source "target/device/Atmel/DataFlashBoot/Config.in" - -source "target/device/Atmel/at91bootstrap/Config.in" - endif diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index c5dfffd..6de54d7 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -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) diff --git a/target/powerpc/Makefile.in b/target/powerpc/Makefile.in deleted file mode 100644 index 0d4698d..0000000 --- a/target/powerpc/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -include target/powerpc/*/*.mk diff --git a/target/x86/Makefile.in b/target/x86/Makefile.in deleted file mode 100644 index 115035c..0000000 --- a/target/x86/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(BR2_i386),y) -include target/x86/*/*.mk -endif -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 02/49] yaboot: drop support 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 01/49] bootloaders: move bootloader build code to boot/ Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 03/49] boot: remove references to COPYTO Thomas Petazzoni ` (46 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Yaboot 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 <thomas.petazzoni@free-electrons.com> --- 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 diff --git a/boot/Config.in b/boot/Config.in index 6f2796f..78ff82c 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -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" diff --git a/boot/yaboot/Config.in b/boot/yaboot/Config.in deleted file mode 100644 index 75da815..0000000 --- a/boot/yaboot/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_TARGET_YABOOT - bool "yaboot" - depends on BR2_powerpc - help - The yaboot bootloader for new world powerpc systems. diff --git a/boot/yaboot/yaboot.mk b/boot/yaboot/yaboot.mk deleted file mode 100644 index cbeae50..0000000 --- a/boot/yaboot/yaboot.mk +++ /dev/null @@ -1,44 +0,0 @@ -ifeq ($(ARCH),powerpc) - -############################################################# -# -# yaboot -# -############################################################# - -YABOOT_SOURCE:=yaboot-1.3.13.tar.gz -YABOOT_SITE:=http://penguinppc.org/bootloaders/yaboot -YABOOT_DIR:=$(BUILD_DIR)/yaboot-1.3.13 - -$(DL_DIR)/$(YABOOT_SOURCE): - $(call DOWNLOAD,$(YABOOT_SITE),$(YABOOT_SOURCE)) - -yaboot-source: $(DL_DIR)/$(YABOOT_SOURCE) - -$(YABOOT_DIR)/Makefile: $(DL_DIR)/$(YABOOT_SOURCE) - $(ZCAT) $(DL_DIR)/$(YABOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf - - touch -c $(YABOOT_DIR)/Makefile - -$(YABOOT_DIR)/second/yaboot: $(YABOOT_DIR)/Makefile - $(MAKE) -C $(YABOOT_DIR) CROSS=$(TARGET_CROSS) - touch -c $(YABOOT_DIR)/second/yaboot - -yaboot: $(YABOOT_DIR)/second/yaboot - -yaboot-clean: - $(MAKE) -C $(YABOOT_DIR) clean - -yaboot-dirclean: - rm -rf $(YABOOT_DIR) - -endif - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_YABOOT),y) -TARGETS+=yaboot -endif - -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 03/49] boot: remove references to COPYTO 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 01/49] bootloaders: move bootloader build code to boot/ Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 02/49] yaboot: drop support Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 04/49] u-boot: do not default to $(BOARD_NAME) for the board name Thomas Petazzoni ` (45 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 6 ------ boot/at91dataflashboot/at91dataflashboot.mk | 3 +-- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index 2072c6b..dc475e4 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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 diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 8939c28..519328c 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -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) ############################################################# # -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 04/49] u-boot: do not default to $(BOARD_NAME) for the board name 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (2 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 03/49] boot: remove references to COPYTO Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 05/49] u-boot: remove ancient versions Thomas Petazzoni ` (44 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index ca47e18..b07e67c 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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. -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 05/49] u-boot: remove ancient versions 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (3 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 04/49] u-boot: do not default to $(BOARD_NAME) for the board name Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-14 13:51 ` Jonathan dumaresq 2010-06-12 14:21 ` [Buildroot] [PATCH 06/49] u-boot: rename Makefile.in to u-boot.mk for coherency Thomas Petazzoni ` (43 subsequent siblings) 48 siblings, 1 reply; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index b07e67c..49d66c4 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 05/49] u-boot: remove ancient versions 2010-06-12 14:21 ` [Buildroot] [PATCH 05/49] u-boot: remove ancient versions Thomas Petazzoni @ 2010-06-14 13:51 ` Jonathan dumaresq 0 siblings, 0 replies; 53+ messages in thread From: Jonathan dumaresq @ 2010-06-14 13:51 UTC (permalink / raw) To: buildroot Hi Thomas, Like I already said, removing the 2008.10 version will broke the atngw100 target and stk1000 too. I wonder if we can use the GIT version of Haavard Skinnemoen directly. I have not use it and tested it but this tree should work. I think only this patch is needed to get the atngw100 bord working http://git.denx.de/?p=u-boot/u-boot-avr32.git;a=commit;h=fc3174ef4dc5a90d528 58e37505c51573fc3cfe3 Again I couldn't confirm it. Jonathan buildroot-bounces at busybox.net wrote: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > boot/u-boot/Config.in | 26 -------------------------- > 1 files changed, 0 insertions(+), 26 deletions(-) > > diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index > b07e67c..49d66c4 100644 --- a/boot/u-boot/Config.in > +++ b/boot/u-boot/Config.in > @@ -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" > -- > 1.7.0.4 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 06/49] u-boot: rename Makefile.in to u-boot.mk for coherency 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (4 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 05/49] u-boot: remove ancient versions Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 07/49] u-boot: remove option to configure download site Thomas Petazzoni ` (42 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- 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%) diff --git a/boot/u-boot/Makefile.in b/boot/u-boot/u-boot.mk similarity index 100% rename from boot/u-boot/Makefile.in rename to boot/u-boot/u-boot.mk -- 1.7.0.4 ^ permalink raw reply [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 07/49] u-boot: remove option to configure download site 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (5 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 06/49] u-boot: rename Makefile.in to u-boot.mk for coherency Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 08/49] u-boot: remove arch specific patches infrastructure Thomas Petazzoni ` (41 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 4 ---- boot/u-boot/u-boot.mk | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 49d66c4..3f4110a 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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 diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index a875f2b..7e98ca8 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 08/49] u-boot: remove arch specific patches infrastructure 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (6 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 07/49] u-boot: remove option to configure download site Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 09/49] u-boot: remove u-boot-status make target Thomas Petazzoni ` (40 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot A 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 <thomas.petazzoni@free-electrons.com> --- 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 diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 3f4110a..4c76d57 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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 diff --git a/target/device/Atmel/arch-arm/Makefile.in b/target/device/Atmel/arch-arm/Makefile.in deleted file mode 100644 index e4ca543..0000000 --- a/target/device/Atmel/arch-arm/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -include target/device/Atmel/arch-arm/u-boot/Makefile.in - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch deleted file mode 100644 index 0445b23..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch +++ /dev/null @@ -1,723 +0,0 @@ -diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pio.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pio.h ---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pio.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pio.h 2009-01-01 14:02:28.000000000 +0100 -@@ -0,0 +1,49 @@ -+/* -+ * [origin: Linux kernel include/asm-arm/arch-at91/at91_pio.h] -+ * -+ * Copyright (C) 2005 Ivan Kokshaysky -+ * Copyright (C) SAN People -+ * -+ * Parallel I/O Controller (PIO) - System peripherals registers. -+ * Based on AT91RM9200 datasheet revision E. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+ -+#ifndef AT91_PIO_H -+#define AT91_PIO_H -+ -+#define PIO_PER 0x00 /* Enable Register */ -+#define PIO_PDR 0x04 /* Disable Register */ -+#define PIO_PSR 0x08 /* Status Register */ -+#define PIO_OER 0x10 /* Output Enable Register */ -+#define PIO_ODR 0x14 /* Output Disable Register */ -+#define PIO_OSR 0x18 /* Output Status Register */ -+#define PIO_IFER 0x20 /* Glitch Input Filter Enable */ -+#define PIO_IFDR 0x24 /* Glitch Input Filter Disable */ -+#define PIO_IFSR 0x28 /* Glitch Input Filter Status */ -+#define PIO_SODR 0x30 /* Set Output Data Register */ -+#define PIO_CODR 0x34 /* Clear Output Data Register */ -+#define PIO_ODSR 0x38 /* Output Data Status Register */ -+#define PIO_PDSR 0x3c /* Pin Data Status Register */ -+#define PIO_IER 0x40 /* Interrupt Enable Register */ -+#define PIO_IDR 0x44 /* Interrupt Disable Register */ -+#define PIO_IMR 0x48 /* Interrupt Mask Register */ -+#define PIO_ISR 0x4c /* Interrupt Status Register */ -+#define PIO_MDER 0x50 /* Multi-driver Enable Register */ -+#define PIO_MDDR 0x54 /* Multi-driver Disable Register */ -+#define PIO_MDSR 0x58 /* Multi-driver Status Register */ -+#define PIO_PUDR 0x60 /* Pull-up Disable Register */ -+#define PIO_PUER 0x64 /* Pull-up Enable Register */ -+#define PIO_PUSR 0x68 /* Pull-up Status Register */ -+#define PIO_ASR 0x70 /* Peripheral A Select Register */ -+#define PIO_BSR 0x74 /* Peripheral B Select Register */ -+#define PIO_ABSR 0x78 /* AB Status Register */ -+#define PIO_OWER 0xa0 /* Output Write Enable Register */ -+#define PIO_OWDR 0xa4 /* Output Write Disable Register */ -+#define PIO_OWSR 0xa8 /* Output Write Status Register */ -+ -+#endif -diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pmc.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pmc.h ---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pmc.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pmc.h 2009-01-01 15:51:28.000000000 +0100 -@@ -0,0 +1,116 @@ -+/* -+ * [origin: Linux kernel include/asm-arm/arch-at91/at91_pmc.h] -+ * -+ * Copyright (C) 2005 Ivan Kokshaysky -+ * Copyright (C) SAN People -+ * -+ * Copyright (C) 2008 Ulf Samuelsson -+ * -+ * Power Management Controller (PMC) - System peripherals registers. -+ * Based on AT91RM9200 datasheet revision E. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+ -+#ifndef AT91_PMC_H -+#define AT91_PMC_H -+ -+#define AT91_PMC_SCER (AT91_PMC + 0x00) /* System Clock Enable Register */ -+#define AT91_PMC_SCDR (AT91_PMC + 0x04) /* System Clock Disable Register */ -+ -+#define AT91_PMC_SCSR (AT91_PMC + 0x08) /* System Clock Status Register */ -+#define AT91_PMC_PCK (1 << 0) /* Processor Clock */ -+#define AT91RM9200_PMC_UDP (1 << 1) /* USB Devcice Port Clock [AT91RM9200 only] */ -+#define AT91RM9200_PMC_MCKUDP (1 << 2) /* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */ -+#define AT91RM9200_PMC_UHP (1 << 4) /* USB Host Port Clock [AT91RM9200 only] */ -+#define AT91SAM926x_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91SAM926x only] */ -+#define AT91CAP9_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91CAP9 only] */ -+#define AT91SAM926x_PMC_UDP (1 << 7) /* USB Devcice Port Clock [AT91SAM926x only] */ -+#define AT91_PMC_PCK0 (1 << 8) /* Programmable Clock 0 */ -+#define AT91_PMC_PCK1 (1 << 9) /* Programmable Clock 1 */ -+#define AT91_PMC_PCK2 (1 << 10) /* Programmable Clock 2 */ -+#define AT91_PMC_PCK3 (1 << 11) /* Programmable Clock 3 */ -+#define AT91_PMC_HCK0 (1 << 16) /* AHB Clock (USB host) [AT91SAM9261 only] */ -+#define AT91_PMC_HCK1 (1 << 17) /* AHB Clock (LCD) [AT91SAM9261 only] */ -+#define AT91_PMC_RES_0C (AT91_PMC + 0x0c) /* Reserved */ -+ -+#define AT91_PMC_PCER (AT91_PMC + 0x10) /* Peripheral Clock Enable Register */ -+#define AT91_PMC_PCDR (AT91_PMC + 0x14) /* Peripheral Clock Disable Register */ -+#define AT91_PMC_PCSR (AT91_PMC + 0x18) /* Peripheral Clock Status Register */ -+#define AT91_PMC_RES_1C (AT91_PMC + 0x1c) /* Reserved */ -+ -+ -+#define AT91_CKGR_MOR (AT91_PMC + 0x20) /* Main Oscillator Register [not on SAM9RL] */ -+#define AT91_PMC_MOSCEN (1 << 0) /* Main Oscillator Enable */ -+#define AT91_PMC_OSCBYPASS (1 << 1) /* Oscillator Bypass [AT91SAM926x only] */ -+#define AT91_PMC_OSCOUNT (0xff << 8) /* Main Oscillator Start-up Time */ -+ -+#define AT91_CKGR_MCFR (AT91_PMC + 0x24) /* Main Clock Frequency Register */ -+#define AT91_PMC_MAINF (0xffff << 0) /* Main Clock Frequency */ -+#define AT91_PMC_MAINRDY (1 << 16) /* Main Clock Ready */ -+ -+#define AT91_CKGR_PLLAR (AT91_PMC + 0x28) /* PLL A Register */ -+#define AT91_CKGR_PLLBR (AT91_PMC + 0x2c) /* PLL B Register */ -+#define AT91_PMC_DIV (0xff << 0) /* Divider */ -+#define AT91_PMC_PLLCOUNT (0x3f << 8) /* PLL Counter */ -+#define AT91_PMC_OUT (3 << 14) /* PLL Clock Frequency Range */ -+#define AT91_PMC_MUL (0x7ff << 16) /* PLL Multiplier */ -+#define AT91_PMC_USBDIV (3 << 28) /* USB Divisor (PLLB only) */ -+#define AT91_PMC_USBDIV_1 (0 << 28) -+#define AT91_PMC_USBDIV_2 (1 << 28) -+#define AT91_PMC_USBDIV_4 (2 << 28) -+#define AT91_PMC_USB96M (1 << 28) /* Divider by 2 Enable (PLLB only) */ -+ -+#define AT91_PMC_MCKR (AT91_PMC + 0x30) /* Master Clock Register */ -+#define AT91_PMC_CSS (3 << 0) /* Master Clock Selection */ -+#define AT91_PMC_CSS_SLOW (0 << 0) -+#define AT91_PMC_CSS_MAIN (1 << 0) -+#define AT91_PMC_CSS_PLLA (2 << 0) -+#define AT91_PMC_CSS_PLLB (3 << 0) -+#define AT91_PMC_PRES (7 << 2) /* Master Clock Prescaler */ -+#define AT91_PMC_PRES_1 (0 << 2) -+#define AT91_PMC_PRES_2 (1 << 2) -+#define AT91_PMC_PRES_4 (2 << 2) -+#define AT91_PMC_PRES_8 (3 << 2) -+#define AT91_PMC_PRES_16 (4 << 2) -+#define AT91_PMC_PRES_32 (5 << 2) -+#define AT91_PMC_PRES_64 (6 << 2) -+#define AT91_PMC_MDIV (3 << 8) /* Master Clock Division */ -+#define AT91_PMC_MDIV_1 (0 << 8) -+#define AT91_PMC_MDIV_2 (1 << 8) -+#define AT91_PMC_MDIV_3 (2 << 8) -+#define AT91_PMC_MDIV_4 (3 << 8) -+ -+#define AT91_PMC_RES_34 (AT91_PMC + 0x34) /* Reserved */ -+#define AT91_PMC_RES_38 (AT91_PMC + 0x38) /* Reserved */ -+#define AT91_PMC_RES_3C (AT91_PMC + 0x3c) /* Reserved */ -+ -+#define AT91_PMC_PCKR(n) (AT91_PMC + 0x40 + ((n) * 4)) /* Programmable Clock 0-3 Registers */ -+ -+#define AT91_PMC_RES_50 (AT91_PMC + 0x50) /* Reserved */ -+#define AT91_PMC_RES_54 (AT91_PMC + 0x54) /* Reserved */ -+#define AT91_PMC_RES_58 (AT91_PMC + 0x58) /* Reserved */ -+#define AT91_PMC_RES_5C (AT91_PMC + 0x5c) /* Reserved */ -+ -+#define AT91_PMC_IER (AT91_PMC + 0x60) /* Interrupt Enable Register */ -+#define AT91_PMC_IDR (AT91_PMC + 0x64) /* Interrupt Disable Register */ -+#define AT91_PMC_SR (AT91_PMC + 0x68) /* Status Register */ -+#define AT91_PMC_MOSCS (1 << 0) /* MOSCS Flag */ -+#define AT91_PMC_LOCKA (1 << 1) /* PLLA Lock */ -+#define AT91_PMC_LOCKB (1 << 2) /* PLLB Lock */ -+#define AT91_PMC_MCKRDY (1 << 3) /* Master Clock */ -+#define AT91_PMC_PCK0RDY (1 << 8) /* Programmable Clock 0 */ -+#define AT91_PMC_PCK1RDY (1 << 9) /* Programmable Clock 1 */ -+#define AT91_PMC_PCK2RDY (1 << 10) /* Programmable Clock 2 */ -+#define AT91_PMC_PCK3RDY (1 << 11) /* Programmable Clock 3 */ -+#define AT91_PMC_IMR (AT91_PMC + 0x6c) /* Interrupt Mask Register */ -+ -+#define AT91_PMC_PROT (AT91_PMC + 0xe4) /* Protect Register [AT91CAP9 revC only] */ -+#define AT91_PMC_PROTKEY 0x504d4301 /* Activation Code */ -+ -+#define AT91_PMC_VER (AT91_PMC + 0xfc) /* PMC Module Version [AT91CAP9 only] */ -+ -+#endif -diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/AT91RM9200.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/AT91RM9200.h ---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/AT91RM9200.h 2009-01-01 13:09:34.000000000 +0100 -+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2009-01-01 15:52:00.000000000 +0100 -@@ -28,6 +28,114 @@ - #ifndef __ASSEMBLY__ - typedef volatile unsigned int AT91_REG; /* Hardware register definition */ - -+/* -+ * Peripheral identifiers/interrupts. -+ */ -+#define AT91RM9200_ID_AIC 0 /* Advanced Interrupt Controller (FIQ) */ -+#define AT91RM9200_ID_SYSIRQ 1 /* System Peripherals */ -+#define AT91RM9200_ID_PIOA 2 /* Parallel IO Controller A */ -+#define AT91RM9200_ID_PIOB 3 /* Parallel IO Controller B */ -+#define AT91RM9200_ID_PIOC 4 /* Parallel IO Controller C */ -+#define AT91RM9200_ID_PIOD 5 /* Parallel IO Controller D */ -+#define AT91RM9200_ID_US0 6 /* USART 0 */ -+#define AT91RM9200_ID_US1 7 /* USART 1 */ -+#define AT91RM9200_ID_US2 8 /* USART 2 */ -+#define AT91RM9200_ID_US3 9 /* USART 2 */ -+#define AT91RM9200_ID_MCI 10 /* Multimedia Card Interface */ -+#define AT91RM9200_ID_UDP 11 /* USB Device Port */ -+#define AT91RM9200_ID_TWI 12 /* Two-Wire Interface */ -+#define AT91RM9200_ID_SPI0 13 /* Serial Peripheral Interface 0 */ -+#define AT91RM9200_ID_SSC0 14 /* Serial Synchronous Controller */ -+#define AT91RM9200_ID_SSC1 15 /* Serial Synchronous Controller */ -+#define AT91RM9200_ID_SSC2 16 /* Serial Synchronous Controller */ -+#define AT91RM9200_ID_TC0 17 /* Timer Counter 0 */ -+#define AT91RM9200_ID_TC1 18 /* Timer Counter 1 */ -+#define AT91RM9200_ID_TC2 19 /* Timer Counter 2 */ -+#define AT91RM9200_ID_TC3 20 /* Timer Counter 3 */ -+#define AT91RM9200_ID_TC4 21 /* Timer Counter 4 */ -+#define AT91RM9200_ID_TC5 22 /* Timer Counter 5 */ -+#define AT91RM9200_ID_UHP 23 /* USB Host port */ -+#define AT91RM9200_ID_EMAC 24 /* Ethernet */ -+#define AT91RM9200_ID_IRQ0 25 /* Advanced Interrupt Controller (IRQ0) */ -+#define AT91RM9200_ID_IRQ1 26 /* Advanced Interrupt Controller (IRQ1) */ -+#define AT91RM9200_ID_IRQ2 27 /* Advanced Interrupt Controller (IRQ2) */ -+#define AT91RM9200_ID_IRQ3 28 /* Advanced Interrupt Controller (IRQ3) */ -+#define AT91RM9200_ID_IRQ4 29 /* Advanced Interrupt Controller (IRQ4) */ -+#define AT91RM9200_ID_IRQ5 30 /* Advanced Interrupt Controller (IRQ5) */ -+#define AT91RM9200_ID_IRQ6 31 /* Advanced Interrupt Controller (IRQ6) */ -+/* -+ * User Peripheral physical base addresses. -+ */ -+ -+ -+ -+#define AT91RM9200_BASE_TC0 0xFFFA0000 /* (TC0) Base Address */ -+#define AT91RM9200_BASE_TC1 0xFFFA4000 /* (TC0) Base Address */ -+#define AT91RM9200_BASE_UDP 0xFFFB0000 /* (TC0) Base Address */ -+#define AT91RM9200_BASE_MCI 0xFFFB4000 /* (TC0) Base Address */ -+#define AT91RM9200_BASE_TWI 0xFFFB8000 /* (TC0) Base Address */ -+#define AT91RM9200_BASE_EMAC 0xFFFBC000 /* (EMAC) Base Address */ -+#define AT91RM9200_BASE_US0 0xFFFC0000 /* (US0) Base Address */ -+#define AT91RM9200_BASE_US1 0xFFFC4000 /* (US1) Base Address */ -+#define AT91RM9200_BASE_US2 0xFFFC8000 /* (US1) Base Address */ -+#define AT91RM9200_BASE_US3 0xFFFCC000 /* (US1) Base Address */ -+#define AT91RM9200_BASE_SPI 0xFFFE0000 /* (SPI) Base Address */ -+ -+#define AT91RM9200_BASE_AIC 0xFFFFF000 /* (AIC) Base Address */ -+#define AT91RM9200_BASE_DBGU 0xFFFFF200 /* (DBGU) Base Address */ -+#define AT91RM9200_BASE_PIOA 0xFFFFF400 /* (PIOA) Base Address */ -+#define AT91RM9200_BASE_PIOB 0xFFFFF600 /* (PIOB) Base Address */ -+#define AT91RM9200_BASE_PIOC 0xFFFFF800 /* (PIOC) Base Address */ -+#define AT91RM9200_BASE_PIOD 0xFFFFFA00 /* (PIOC) Base Address */ -+#define AT91RM9200_BASE_PMC 0xFFFFFC00 /* (PMC) Base Address */ -+#define AT91RM9200_BASE_CKGR 0xFFFFFC20 /* (CKGR) Base Address */ -+#define AT91RM9200_BASE_ST 0xFFFFFD00 /* (PMC) Base Address */ -+#define AT91RM9200_BASE_RTC 0xFFFFFE00 /* (PMC) Base Address */ -+#define AT91RM9200_BASE_MC 0xFFFFFF00 /* (PMC) Base Address */ -+#define AT91RM9200_BASE_EBI 0xFFFFFF60 /* (PMC) Base Address */ -+#define AT91RM9200_BASE_SMC2 0xFFFFFF70 /* (SMC2) Base Address */ -+#define AT91RM9200_BASE_SDRAMC 0xFFFFFF90 /* (SMC2) Base Address */ -+#define AT91RM9200_BASE_BFC 0xFFFFFFC0 /* (SMC2) Base Address */ -+ -+/* -+ * System Peripherals (offset from AT91_BASE_SYS) -+ */ -+#define AT91_BASE_SYS AT91RM9200_BASE_AIC -+ -+#define AT91_AIC (AT91RM9200_BASE_AIC - AT91_BASE_SYS) -+#define AT91_DBGU (AT91RM9200_BASE_DBGU - AT91_BASE_SYS) -+#define AT91_PIOA (AT91RM9200_BASE_PIOA - AT91_BASE_SYS) -+#define AT91_PIOB (AT91RM9200_BASE_PIOB - AT91_BASE_SYS) -+#define AT91_PIOC (AT91RM9200_BASE_PIOC - AT91_BASE_SYS) -+#define AT91_PIOD (AT91RM9200_BASE_PIOD - AT91_BASE_SYS) -+#define AT91_PMC (AT91RM9200_BASE_PMC - AT91_BASE_SYS) -+#define AT91_PMC (AT91RM9200_BASE_PMC - AT91_BASE_SYS) -+#define AT91_PMC (AT91RM9200_BASE_PMC - AT91_BASE_SYS) -+#define AT91_PMC (AT91RM9200_BASE_PMC - AT91_BASE_SYS) -+#define AT91_PMC (AT91RM9200_BASE_PMC - AT91_BASE_SYS) -+ -+#define AT91_CKGR (AT91RM9200_BASE_CKGR - AT91_BASE_SYS) -+#define AT91_ST (AT91RM9200_BASE_ST - AT91_BASE_SYS) -+#define AT91_RTC (AT91RM9200_BASE_RTC - AT91_BASE_SYS) -+#define AT91_MC (AT91RM9200_BASE_MC - AT91_BASE_SYS) -+#define AT91_EBI (AT91RM9200_BASE_EBI - AT91_BASE_SYS) -+#define AT91_EBI_CSA ((AT91RM9200_BASE_EBI +0x00) - AT91_BASE_SYS) -+#define AT91_SMC2 (AT91RM9200_BASE_SMC2 - AT91_BASE_SYS) -+#define AT91_SMC2_CSR0 ((AT91RM9200_BASE_SMC2+0x00) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR1 ((AT91RM9200_BASE_SMC2+0x04) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR2 ((AT91RM9200_BASE_SMC2+0x08) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR3 ((AT91RM9200_BASE_SMC2+0x0c) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR4 ((AT91RM9200_BASE_SMC2+0x10) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR5 ((AT91RM9200_BASE_SMC2+0x14) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR6 ((AT91RM9200_BASE_SMC2+0x18) - AT91_BASE_SYS) -+#define AT91_SMC2_CSR7 ((AT91RM9200_BASE_SMC2+0x1c) - AT91_BASE_SYS) -+ -+ -+#define AT91_USART0 AT91RM9200_BASE_US0 -+#define AT91_USART1 AT91RM9200_BASE_US1 -+#define AT91_USART2 AT91RM9200_BASE_US2 -+#define AT91_USART3 AT91RM9200_BASE_US3 -+ - /*****************************************************************************/ - /* SOFTWARE API DEFINITION FOR Timer Counter Channel Interface */ - /*****************************************************************************/ -diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/gpio.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/gpio.h ---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/gpio.h 2009-01-01 14:02:11.000000000 +0100 -@@ -0,0 +1,367 @@ -+/* -+ * [origin: Linux kernel include/asm-arm/arch-at91/gpio.h] -+ * -+ * Copyright (C) 2005 HP Labs -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ */ -+ -+#ifndef __ASM_ARCH_AT91_GPIO_H -+#define __ASM_ARCH_AT91_GPIO_H -+ -+#include <asm/io.h> -+#include <asm/errno.h> -+#include <asm/arch/at91_pio.h> -+#include <asm/arch/hardware.h> -+ -+#define PIN_BASE 32 -+ -+#define MAX_GPIO_BANKS 5 -+ -+/* these pin numbers double as IRQ numbers, like AT91xxx_ID_* values */ -+ -+#define AT91_PIN_PA0 (PIN_BASE + 0x00 + 0) -+#define AT91_PIN_PA1 (PIN_BASE + 0x00 + 1) -+#define AT91_PIN_PA2 (PIN_BASE + 0x00 + 2) -+#define AT91_PIN_PA3 (PIN_BASE + 0x00 + 3) -+#define AT91_PIN_PA4 (PIN_BASE + 0x00 + 4) -+#define AT91_PIN_PA5 (PIN_BASE + 0x00 + 5) -+#define AT91_PIN_PA6 (PIN_BASE + 0x00 + 6) -+#define AT91_PIN_PA7 (PIN_BASE + 0x00 + 7) -+#define AT91_PIN_PA8 (PIN_BASE + 0x00 + 8) -+#define AT91_PIN_PA9 (PIN_BASE + 0x00 + 9) -+#define AT91_PIN_PA10 (PIN_BASE + 0x00 + 10) -+#define AT91_PIN_PA11 (PIN_BASE + 0x00 + 11) -+#define AT91_PIN_PA12 (PIN_BASE + 0x00 + 12) -+#define AT91_PIN_PA13 (PIN_BASE + 0x00 + 13) -+#define AT91_PIN_PA14 (PIN_BASE + 0x00 + 14) -+#define AT91_PIN_PA15 (PIN_BASE + 0x00 + 15) -+#define AT91_PIN_PA16 (PIN_BASE + 0x00 + 16) -+#define AT91_PIN_PA17 (PIN_BASE + 0x00 + 17) -+#define AT91_PIN_PA18 (PIN_BASE + 0x00 + 18) -+#define AT91_PIN_PA19 (PIN_BASE + 0x00 + 19) -+#define AT91_PIN_PA20 (PIN_BASE + 0x00 + 20) -+#define AT91_PIN_PA21 (PIN_BASE + 0x00 + 21) -+#define AT91_PIN_PA22 (PIN_BASE + 0x00 + 22) -+#define AT91_PIN_PA23 (PIN_BASE + 0x00 + 23) -+#define AT91_PIN_PA24 (PIN_BASE + 0x00 + 24) -+#define AT91_PIN_PA25 (PIN_BASE + 0x00 + 25) -+#define AT91_PIN_PA26 (PIN_BASE + 0x00 + 26) -+#define AT91_PIN_PA27 (PIN_BASE + 0x00 + 27) -+#define AT91_PIN_PA28 (PIN_BASE + 0x00 + 28) -+#define AT91_PIN_PA29 (PIN_BASE + 0x00 + 29) -+#define AT91_PIN_PA30 (PIN_BASE + 0x00 + 30) -+#define AT91_PIN_PA31 (PIN_BASE + 0x00 + 31) -+ -+#define AT91_PIN_PB0 (PIN_BASE + 0x20 + 0) -+#define AT91_PIN_PB1 (PIN_BASE + 0x20 + 1) -+#define AT91_PIN_PB2 (PIN_BASE + 0x20 + 2) -+#define AT91_PIN_PB3 (PIN_BASE + 0x20 + 3) -+#define AT91_PIN_PB4 (PIN_BASE + 0x20 + 4) -+#define AT91_PIN_PB5 (PIN_BASE + 0x20 + 5) -+#define AT91_PIN_PB6 (PIN_BASE + 0x20 + 6) -+#define AT91_PIN_PB7 (PIN_BASE + 0x20 + 7) -+#define AT91_PIN_PB8 (PIN_BASE + 0x20 + 8) -+#define AT91_PIN_PB9 (PIN_BASE + 0x20 + 9) -+#define AT91_PIN_PB10 (PIN_BASE + 0x20 + 10) -+#define AT91_PIN_PB11 (PIN_BASE + 0x20 + 11) -+#define AT91_PIN_PB12 (PIN_BASE + 0x20 + 12) -+#define AT91_PIN_PB13 (PIN_BASE + 0x20 + 13) -+#define AT91_PIN_PB14 (PIN_BASE + 0x20 + 14) -+#define AT91_PIN_PB15 (PIN_BASE + 0x20 + 15) -+#define AT91_PIN_PB16 (PIN_BASE + 0x20 + 16) -+#define AT91_PIN_PB17 (PIN_BASE + 0x20 + 17) -+#define AT91_PIN_PB18 (PIN_BASE + 0x20 + 18) -+#define AT91_PIN_PB19 (PIN_BASE + 0x20 + 19) -+#define AT91_PIN_PB20 (PIN_BASE + 0x20 + 20) -+#define AT91_PIN_PB21 (PIN_BASE + 0x20 + 21) -+#define AT91_PIN_PB22 (PIN_BASE + 0x20 + 22) -+#define AT91_PIN_PB23 (PIN_BASE + 0x20 + 23) -+#define AT91_PIN_PB24 (PIN_BASE + 0x20 + 24) -+#define AT91_PIN_PB25 (PIN_BASE + 0x20 + 25) -+#define AT91_PIN_PB26 (PIN_BASE + 0x20 + 26) -+#define AT91_PIN_PB27 (PIN_BASE + 0x20 + 27) -+#define AT91_PIN_PB28 (PIN_BASE + 0x20 + 28) -+#define AT91_PIN_PB29 (PIN_BASE + 0x20 + 29) -+#define AT91_PIN_PB30 (PIN_BASE + 0x20 + 30) -+#define AT91_PIN_PB31 (PIN_BASE + 0x20 + 31) -+ -+#define AT91_PIN_PC0 (PIN_BASE + 0x40 + 0) -+#define AT91_PIN_PC1 (PIN_BASE + 0x40 + 1) -+#define AT91_PIN_PC2 (PIN_BASE + 0x40 + 2) -+#define AT91_PIN_PC3 (PIN_BASE + 0x40 + 3) -+#define AT91_PIN_PC4 (PIN_BASE + 0x40 + 4) -+#define AT91_PIN_PC5 (PIN_BASE + 0x40 + 5) -+#define AT91_PIN_PC6 (PIN_BASE + 0x40 + 6) -+#define AT91_PIN_PC7 (PIN_BASE + 0x40 + 7) -+#define AT91_PIN_PC8 (PIN_BASE + 0x40 + 8) -+#define AT91_PIN_PC9 (PIN_BASE + 0x40 + 9) -+#define AT91_PIN_PC10 (PIN_BASE + 0x40 + 10) -+#define AT91_PIN_PC11 (PIN_BASE + 0x40 + 11) -+#define AT91_PIN_PC12 (PIN_BASE + 0x40 + 12) -+#define AT91_PIN_PC13 (PIN_BASE + 0x40 + 13) -+#define AT91_PIN_PC14 (PIN_BASE + 0x40 + 14) -+#define AT91_PIN_PC15 (PIN_BASE + 0x40 + 15) -+#define AT91_PIN_PC16 (PIN_BASE + 0x40 + 16) -+#define AT91_PIN_PC17 (PIN_BASE + 0x40 + 17) -+#define AT91_PIN_PC18 (PIN_BASE + 0x40 + 18) -+#define AT91_PIN_PC19 (PIN_BASE + 0x40 + 19) -+#define AT91_PIN_PC20 (PIN_BASE + 0x40 + 20) -+#define AT91_PIN_PC21 (PIN_BASE + 0x40 + 21) -+#define AT91_PIN_PC22 (PIN_BASE + 0x40 + 22) -+#define AT91_PIN_PC23 (PIN_BASE + 0x40 + 23) -+#define AT91_PIN_PC24 (PIN_BASE + 0x40 + 24) -+#define AT91_PIN_PC25 (PIN_BASE + 0x40 + 25) -+#define AT91_PIN_PC26 (PIN_BASE + 0x40 + 26) -+#define AT91_PIN_PC27 (PIN_BASE + 0x40 + 27) -+#define AT91_PIN_PC28 (PIN_BASE + 0x40 + 28) -+#define AT91_PIN_PC29 (PIN_BASE + 0x40 + 29) -+#define AT91_PIN_PC30 (PIN_BASE + 0x40 + 30) -+#define AT91_PIN_PC31 (PIN_BASE + 0x40 + 31) -+ -+#define AT91_PIN_PD0 (PIN_BASE + 0x60 + 0) -+#define AT91_PIN_PD1 (PIN_BASE + 0x60 + 1) -+#define AT91_PIN_PD2 (PIN_BASE + 0x60 + 2) -+#define AT91_PIN_PD3 (PIN_BASE + 0x60 + 3) -+#define AT91_PIN_PD4 (PIN_BASE + 0x60 + 4) -+#define AT91_PIN_PD5 (PIN_BASE + 0x60 + 5) -+#define AT91_PIN_PD6 (PIN_BASE + 0x60 + 6) -+#define AT91_PIN_PD7 (PIN_BASE + 0x60 + 7) -+#define AT91_PIN_PD8 (PIN_BASE + 0x60 + 8) -+#define AT91_PIN_PD9 (PIN_BASE + 0x60 + 9) -+#define AT91_PIN_PD10 (PIN_BASE + 0x60 + 10) -+#define AT91_PIN_PD11 (PIN_BASE + 0x60 + 11) -+#define AT91_PIN_PD12 (PIN_BASE + 0x60 + 12) -+#define AT91_PIN_PD13 (PIN_BASE + 0x60 + 13) -+#define AT91_PIN_PD14 (PIN_BASE + 0x60 + 14) -+#define AT91_PIN_PD15 (PIN_BASE + 0x60 + 15) -+#define AT91_PIN_PD16 (PIN_BASE + 0x60 + 16) -+#define AT91_PIN_PD17 (PIN_BASE + 0x60 + 17) -+#define AT91_PIN_PD18 (PIN_BASE + 0x60 + 18) -+#define AT91_PIN_PD19 (PIN_BASE + 0x60 + 19) -+#define AT91_PIN_PD20 (PIN_BASE + 0x60 + 20) -+#define AT91_PIN_PD21 (PIN_BASE + 0x60 + 21) -+#define AT91_PIN_PD22 (PIN_BASE + 0x60 + 22) -+#define AT91_PIN_PD23 (PIN_BASE + 0x60 + 23) -+#define AT91_PIN_PD24 (PIN_BASE + 0x60 + 24) -+#define AT91_PIN_PD25 (PIN_BASE + 0x60 + 25) -+#define AT91_PIN_PD26 (PIN_BASE + 0x60 + 26) -+#define AT91_PIN_PD27 (PIN_BASE + 0x60 + 27) -+#define AT91_PIN_PD28 (PIN_BASE + 0x60 + 28) -+#define AT91_PIN_PD29 (PIN_BASE + 0x60 + 29) -+#define AT91_PIN_PD30 (PIN_BASE + 0x60 + 30) -+#define AT91_PIN_PD31 (PIN_BASE + 0x60 + 31) -+ -+#define AT91_PIN_PE0 (PIN_BASE + 0x80 + 0) -+#define AT91_PIN_PE1 (PIN_BASE + 0x80 + 1) -+#define AT91_PIN_PE2 (PIN_BASE + 0x80 + 2) -+#define AT91_PIN_PE3 (PIN_BASE + 0x80 + 3) -+#define AT91_PIN_PE4 (PIN_BASE + 0x80 + 4) -+#define AT91_PIN_PE5 (PIN_BASE + 0x80 + 5) -+#define AT91_PIN_PE6 (PIN_BASE + 0x80 + 6) -+#define AT91_PIN_PE7 (PIN_BASE + 0x80 + 7) -+#define AT91_PIN_PE8 (PIN_BASE + 0x80 + 8) -+#define AT91_PIN_PE9 (PIN_BASE + 0x80 + 9) -+#define AT91_PIN_PE10 (PIN_BASE + 0x80 + 10) -+#define AT91_PIN_PE11 (PIN_BASE + 0x80 + 11) -+#define AT91_PIN_PE12 (PIN_BASE + 0x80 + 12) -+#define AT91_PIN_PE13 (PIN_BASE + 0x80 + 13) -+#define AT91_PIN_PE14 (PIN_BASE + 0x80 + 14) -+#define AT91_PIN_PE15 (PIN_BASE + 0x80 + 15) -+#define AT91_PIN_PE16 (PIN_BASE + 0x80 + 16) -+#define AT91_PIN_PE17 (PIN_BASE + 0x80 + 17) -+#define AT91_PIN_PE18 (PIN_BASE + 0x80 + 18) -+#define AT91_PIN_PE19 (PIN_BASE + 0x80 + 19) -+#define AT91_PIN_PE20 (PIN_BASE + 0x80 + 20) -+#define AT91_PIN_PE21 (PIN_BASE + 0x80 + 21) -+#define AT91_PIN_PE22 (PIN_BASE + 0x80 + 22) -+#define AT91_PIN_PE23 (PIN_BASE + 0x80 + 23) -+#define AT91_PIN_PE24 (PIN_BASE + 0x80 + 24) -+#define AT91_PIN_PE25 (PIN_BASE + 0x80 + 25) -+#define AT91_PIN_PE26 (PIN_BASE + 0x80 + 26) -+#define AT91_PIN_PE27 (PIN_BASE + 0x80 + 27) -+#define AT91_PIN_PE28 (PIN_BASE + 0x80 + 28) -+#define AT91_PIN_PE29 (PIN_BASE + 0x80 + 29) -+#define AT91_PIN_PE30 (PIN_BASE + 0x80 + 30) -+#define AT91_PIN_PE31 (PIN_BASE + 0x80 + 31) -+ -+static unsigned long at91_pios[] = { -+ AT91_PIOA, -+ AT91_PIOB, -+ AT91_PIOC, -+#ifdef AT91_PIOD -+ AT91_PIOD, -+#ifdef AT91_PIOE -+ AT91_PIOE -+#endif -+#endif -+}; -+ -+static inline void *pin_to_controller(unsigned pin) -+{ -+ pin -= PIN_BASE; -+ pin /= 32; -+ return (void *)(AT91_BASE_SYS + at91_pios[pin]); -+} -+ -+static inline unsigned pin_to_mask(unsigned pin) -+{ -+ pin -= PIN_BASE; -+ return 1 << (pin % 32); -+} -+ -+/* -+ * mux the pin to the "GPIO" peripheral role. -+ */ -+static inline int at91_set_GPIO_periph(unsigned pin, int use_pullup) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + PIO_IDR); -+ __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); -+ __raw_writel(mask, pio + PIO_PER); -+ return 0; -+} -+ -+/* -+ * mux the pin to the "A" internal peripheral role. -+ */ -+static inline int at91_set_A_periph(unsigned pin, int use_pullup) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + PIO_IDR); -+ __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); -+ __raw_writel(mask, pio + PIO_ASR); -+ __raw_writel(mask, pio + PIO_PDR); -+ return 0; -+} -+ -+/* -+ * mux the pin to the "B" internal peripheral role. -+ */ -+static inline int at91_set_B_periph(unsigned pin, int use_pullup) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + PIO_IDR); -+ __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); -+ __raw_writel(mask, pio + PIO_BSR); -+ __raw_writel(mask, pio + PIO_PDR); -+ return 0; -+} -+ -+/* -+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and -+ * configure it for an input. -+ */ -+static inline int at91_set_gpio_input(unsigned pin, int use_pullup) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + PIO_IDR); -+ __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); -+ __raw_writel(mask, pio + PIO_ODR); -+ __raw_writel(mask, pio + PIO_PER); -+ return 0; -+} -+ -+/* -+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral), -+ * and configure it for an output. -+ */ -+static inline int at91_set_gpio_output(unsigned pin, int value) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + PIO_IDR); -+ __raw_writel(mask, pio + PIO_PUDR); -+ __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR)); -+ __raw_writel(mask, pio + PIO_OER); -+ __raw_writel(mask, pio + PIO_PER); -+ return 0; -+} -+ -+/* -+ * enable/disable the glitch filter; mostly used with IRQ handling. -+ */ -+static inline int at91_set_deglitch(unsigned pin, int is_on) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + (is_on ? PIO_IFER : PIO_IFDR)); -+ return 0; -+} -+ -+/* -+ * enable/disable the multi-driver; This is only valid for output and -+ * allows the output pin to run as an open collector output. -+ */ -+static inline int at91_set_multi_drive(unsigned pin, int is_on) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + (is_on ? PIO_MDER : PIO_MDDR)); -+ return 0; -+} -+ -+static inline int gpio_direction_input(unsigned pin) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ if (!(__raw_readl(pio + PIO_PSR) & mask)) -+ return -EINVAL; -+ __raw_writel(mask, pio + PIO_ODR); -+ return 0; -+} -+ -+static inline int gpio_direction_output(unsigned pin, int value) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ if (!(__raw_readl(pio + PIO_PSR) & mask)) -+ return -EINVAL; -+ __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR)); -+ __raw_writel(mask, pio + PIO_OER); -+ return 0; -+} -+ -+/* -+ * assuming the pin is muxed as a gpio output, set its value. -+ */ -+static inline int at91_set_gpio_value(unsigned pin, int value) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ -+ __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR)); -+ return 0; -+} -+ -+/* -+ * read the pin's value (works even if it's not muxed as a gpio). -+ */ -+static inline int at91_get_gpio_value(unsigned pin) -+{ -+ void *pio = pin_to_controller(pin); -+ unsigned mask = pin_to_mask(pin); -+ u32 pdsr; -+ -+ pdsr = __raw_readl(pio + PIO_PDSR); -+ return (pdsr & mask) != 0; -+} -+ -+#endif -diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/io.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/io.h ---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/io.h 2009-01-01 15:59:51.000000000 +0100 -@@ -0,0 +1,56 @@ -+/* -+ * [origin: Linux kernel include/asm-arm/arch-at91/io.h] -+ * -+ * Copyright (C) 2003 SAN People -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+#ifndef __ASM_ARCH_IO_H -+#define __ASM_ARCH_IO_H -+ -+#include <asm/io.h> -+ -+static inline unsigned int at91_sys_read(unsigned int reg_offset) -+{ -+ void *addr = (void *)AT91_BASE_SYS; -+ -+ return __raw_readl(addr + reg_offset); -+} -+ -+static inline void at91_sys_write(unsigned int reg_offset, unsigned long value) -+{ -+ void *addr = (void *)AT91_BASE_SYS; -+ -+ __raw_writel(value, addr + reg_offset); -+} -+ -+static inline void at91_sys_setbit(unsigned long value, unsigned int reg_offset) -+{ -+ void *addr = (void *)(AT91_BASE_SYS + reg_offset); -+ value |= __raw_readl(addr); -+ __raw_writel(value, addr); -+} -+ -+static inline void at91_sys_clrbit(unsigned long value, unsigned int reg_offset) -+{ -+ void *addr = (void *)(AT91_BASE_SYS + reg_offset); -+ unsigned long data; -+ data = __raw_readl(addr); -+ data &= ~value; -+ __raw_writel(data, addr); -+} -+ -+#endif - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch deleted file mode 100644 index 2e7e578..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff -urN u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk_df.h u-boot-2009.01/include/configs/at91rm9200dk_df.h ---- u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk_df.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200dk_df.h 2009-01-01 21:19:30.000000000 +0100 -@@ -0,0 +1,251 @@ -+/* -+ * Rick Bronson <rick@efn.org> -+ * -+ * Configuration settings for the AT91RM9200DK board. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+#define AT91RM9200_BOARD MACH_TYPE_AT91RM9200DK -+#define CONFIG_HOSTNAME at91rm9200dk -+ -+/* ARM asynchronous clock */ -+#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ -+#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ -+/* #define AT91C_MASTER_CLOCK 44928000 */ /* peripheral clock (AT91C_MASTER_CLOCK / 4) */ -+ -+#define AT91_SLOW_CLOCK 32768 /* slow clock */ -+ -+#define CONFIG_ARM920T 1 /* This is an ARM920T Core */ -+#define CONFIG_AT91 1 /* THis is an ARM from the AT91 family */ -+#define CONFIG_AT91RM9200 1 /* It's an Atmel AT91RM9200 SoC */ -+#define CONFIG_AT91RM9200DK 1 /* on an AT91RM9200DK Board */ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+#define USE_920T_MMU 1 -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT /* Already done by dataflashboot */ -+ -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_INITRD_TAG 1 -+ -+#ifndef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 -+/* flash */ -+#define MC_PUIA_VAL 0x00000000 -+#define MC_PUP_VAL 0x00000000 -+#define MC_PUER_VAL 0x00000000 -+#define MC_ASR_VAL 0x00000000 -+#define MC_AASR_VAL 0x00000000 -+#define EBI_CFGR_VAL 0x00000000 -+#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ -+ -+/* clocks */ -+#define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */ -+#define PLLBR_VAL 0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */ -+#define MCKR_VAL 0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */ -+ -+/* sdram */ -+#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */ -+#define PIOC_BSR_VAL 0x00000000 -+#define PIOC_PDR_VAL 0xFFFF0000 -+#define EBI_CSA_VAL 0x00000002 /* CS1=SDRAM */ -+#define SDRC_CR_VAL 0x2188c155 /* set up the SDRAM */ -+#define SDRAM 0x20000000 /* address of the SDRAM */ -+#define SDRAM1 0x20000080 /* address of the SDRAM */ -+#define SDRAM_VAL 0x00000000 /* value written to SDRAM */ -+#define SDRC_MR_VAL 0x00000002 /* Precharge All */ -+#define SDRC_MR_VAL1 0x00000004 /* refresh */ -+#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ -+#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */ -+#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -+#else -+#define CONFIG_SKIP_RELOCATE_UBOOT -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+/* -+ * Size of malloc() pool -+ */ -+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -+#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+#define CONFIG_BAUDRATE 115200 -+ -+/* -+ * Hardware drivers -+ */ -+ -+/* define one of these to choose the DBGU, USART0 or USART1 as console */ -+#define CONFIG_DBGU -+#undef CONFIG_USART0 -+#undef CONFIG_USART1 -+ -+#undef CONFIG_HWFLOW /* don't include RTS/CTS flow control support */ -+ -+#undef CONFIG_MODEM_SUPPORT /* disable modem initialization stuff */ -+ -+#define CONFIG_BOOTDELAY 3 -+/* #define CONFIG_ENV_OVERWRITE 1 */ -+ -+ -+/* -+ * BOOTP options -+ */ -+#define CONFIG_BOOTP_BOOTFILESIZE -+#define CONFIG_BOOTP_BOOTPATH -+#define CONFIG_BOOTP_GATEWAY -+#define CONFIG_BOOTP_HOSTNAME -+ -+ -+/* -+ * Command line configuration. -+ */ -+#include <config_cmd_default.h> -+ -+#define CONFIG_CMD_DHCP -+#define CONFIG_CMD_MII -+#define CONFIG_CMD_NAND -+#define CONFIG_CMD_AT91_SPIMUX -+ -+#define CONFIG_NAND_LEGACY -+ -+#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define SECTORSIZE 512 -+ -+#define ADDR_COLUMN 1 -+#define ADDR_PAGE 2 -+#define ADDR_COLUMN_PAGE 3 -+ -+#define NAND_ChipID_UNKNOWN 0x00 -+#define NAND_MAX_FLOORS 1 -+#define NAND_MAX_CHIPS 1 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 22) /* our ALE is AD22 */ -+#define AT91_SMART_MEDIA_CLE (1 << 21) /* our CLE is AD21 */ -+ -+#include <asm/arch/AT91RM9200.h> /* needed for port definitions */ -+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0) -+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0) -+ -+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2)) -+ -+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0) -+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0) -+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0) -+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr)) -+/* the following are NOP's in our implementation */ -+#define NAND_CTL_CLRALE(nandptr) -+#define NAND_CTL_SETALE(nandptr) -+#define NAND_CTL_CLRCLE(nandptr) -+#define NAND_CTL_SETCLE(nandptr) -+ -+#define CONFIG_NR_DRAM_BANKS 1 -+#define PHYS_SDRAM 0x20000000 -+#define PHYS_SDRAM_SIZE 0x2000000 /* 32 megs */ -+ -+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -+#define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144 -+ -+#define CONFIG_DRIVER_ETHER -+#define CONFIG_NET_RETRY_COUNT 20 -+#define CONFIG_AT91C_USE_RMII -+ -+/* AC Characteristics */ -+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */ -+#define DATAFLASH_TCSS (0xC << 16) -+#define DATAFLASH_TCHS (0x1 << 24) -+ -+#define CONFIG_HAS_DATAFLASH 1 -+#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) -+#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 -+#define CONFIG_SYS_MAX_DATAFLASH_PAGES 16384 -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* Logical adress for CS0 */ -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 0xD0000000 /* Logical adress for CS3 */ -+#define CONFIG__SUPPORT_BLOCK_ERASE 1 -+ -+ -+#define PHYS_FLASH_1 0x10000000 -+#define PHYS_FLASH_SIZE 0x200000 /* 2 megs main flash */ -+#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_MAX_FLASH_BANKS 1 -+#define CONFIG_SYS_MAX_FLASH_SECT 256 -+#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -+#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -+ -+#define CONFIG_ENV_IS_IN_DATAFLASH 1 -+#define CONFIG_NEW_PARTITION 1 -+ -+#ifdef CONFIG_ENV_IS_IN_DATAFLASH -+#ifdef CONFIG_NEW_PARTITION -+#define CONFIG_ENV_OFFSET 0x4200 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x2000 /* 8 * 1056 really , but start.s is not OK with this*/ -+#else -+#define CONFIG_ENV_OFFSET 0x20000 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#endif -+#else -+#define CONFIG_ENV_IS_IN_FLASH 1 -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#else -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ -+#define CONFIG_ENV_SIZE 0x10000 /* sectors are 64K here */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */ -+ -+#if defined(CONFIG_AT91RM9200DK) -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB7 -+#else -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB22 -+#endif -+ -+#define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ -+ -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_BOOT_SIZE 0x6000 /* 24 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) -+#define CONFIG_SYS_U_BOOT_SIZE 0x10000 /* 64 KBytes */ -+#else -+#define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_U_BOOT_SIZE 0x60000 /* 384 KBytes */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+ -+#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 } -+ -+#define CONFIG_SYS_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -+ -+#define CONFIG_SYS_HZ 1000 -+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2 /* AT91C_TC0_CMR is implicitly set to */ -+ /* AT91C_TC_TIMER_DIV1_CLOCK */ -+ -+#define CONFIG_STACKSIZE (32*1024) /* regular stack */ -+ -+#ifdef CONFIG_USE_IRQ -+#error CONFIG_USE_IRQ not supported -+#endif -+ -+#endif -diff -urN u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk.h u-boot-2009.01/include/configs/at91rm9200dk.h ---- u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk.h 2009-01-01 13:09:35.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200dk.h 2009-01-01 17:06:32.000000000 +0100 -@@ -24,6 +24,8 @@ - - #ifndef __CONFIG_H - #define __CONFIG_H -+#define AT91RM9200_BOARD MACH_TYPE_AT91RM9200DK -+#define CONFIG_HOSTNAME at91rm9200dk - - /* ARM asynchronous clock */ - #define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ -@@ -33,6 +35,7 @@ - #define AT91_SLOW_CLOCK 32768 /* slow clock */ - - #define CONFIG_ARM920T 1 /* This is an ARM920T Core */ -+#define CONFIG_AT91 1 /* THis is an ARM from the AT91 family */ - #define CONFIG_AT91RM9200 1 /* It's an Atmel AT91RM9200 SoC */ - #define CONFIG_AT91RM9200DK 1 /* on an AT91RM9200DK Board */ - #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -@@ -117,6 +120,7 @@ - #define CONFIG_CMD_DHCP - #define CONFIG_CMD_MII - #define CONFIG_CMD_NAND -+#define CONFIG_CMD_AT91_SPIMUX - - #define CONFIG_NAND_LEGACY - -@@ -198,6 +202,11 @@ - #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ - #endif /* CONFIG_ENV_IS_IN_DATAFLASH */ - -+#if defined(CONFIG_AT91RM9200DK) -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB7 -+#else -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB22 -+#endif - - #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ - -diff -urN u-boot-2009.01-rc1-0rig//Makefile u-boot-2009.01/Makefile ---- u-boot-2009.01-rc1-0rig//Makefile 2009-01-01 13:09:30.000000000 +0100 -+++ u-boot-2009.01/Makefile 2009-01-01 21:35:24.000000000 +0100 -@@ -2562,6 +2562,9 @@ - ## Atmel AT91RM9200 Systems - ######################################################################### - -+at91rm9200dk_df_config : unconfig -+ @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 -+ - at91rm9200dk_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 - - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch deleted file mode 100644 index 8f14170..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch +++ /dev/null @@ -1,324 +0,0 @@ -diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/at91rm9200dk.c u-boot-2009.01/board/atmel/at91rm9200dk/at91rm9200dk.c ---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/at91rm9200dk.c 2009-01-01 13:09:31.000000000 +0100 -+++ u-boot-2009.01/board/atmel/at91rm9200dk/at91rm9200dk.c 2009-01-01 16:11:36.000000000 +0100 -@@ -3,6 +3,9 @@ - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * -+ * (C) Copyright 2008 -+ * Ulf Samuelsson <ulf.samuelsson@atmel.com> -+ * - * See file CREDITS for list of people who contributed to this - * project. - * -@@ -24,6 +27,10 @@ - - #include <common.h> - #include <asm/arch/AT91RM9200.h> -+#include <asm/arch/at91_pmc.h> -+#include <asm/arch/at91_pio.h> -+#include <asm/arch/gpio.h> -+#include <asm/arch/io.h> - #include <at91rm9200_net.h> - #include <dm9161.h> - -@@ -41,13 +48,13 @@ - - /* Correct IRDA resistor problem */ - /* Set PA23_TXD in Output */ -- ((AT91PS_PIO) AT91C_BASE_PIOA)->PIO_OER = AT91C_PA23_TXD2; -+ at91_set_gpio_output(AT91_PIN_PA23, 1); - - /* memory and cpu-speed are setup before relocation */ - /* so we do _nothing_ here */ - - /* arch number of AT91RM9200DK-Board */ -- gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200DK; -+ gd->bd->bi_arch_number = AT91RM9200_BOARD; - /* adress of boot parameters */ - gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - -@@ -91,46 +98,58 @@ - */ - #if defined(CONFIG_CMD_NAND) - extern ulong nand_probe (ulong physadr); -+/* set the bus interface characteristics based on -+ * tDS Data Set up Time 30 - ns -+ * tDH Data Hold Time 20 - ns -+ * tALS ALE Set up Time 20 - ns -+ * 16ns at 60 MHz ~= 3 -+ */ - --#define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */ --void nand_init (void) --{ -- /* Setup Smart Media, fitst enable the address range of CS3 */ -- *AT91C_EBI_CSA |= AT91C_EBI_CS3A_SMC_SmartMedia; -- /* set the bus interface characteristics based on -- tDS Data Set up Time 30 - ns -- tDH Data Hold Time 20 - ns -- tALS ALE Set up Time 20 - ns -- 16ns at 60 MHz ~= 3 */ - /*memory mapping structures */ - #define SM_ID_RWH (5 << 28) - #define SM_RWH (1 << 28) - #define SM_RWS (0 << 24) - #define SM_TDF (1 << 8) - #define SM_NWS (3) -- AT91C_BASE_SMC2->SMC2_CSR[3] = (SM_RWH | SM_RWS | -- AT91C_SMC2_ACSS_STANDARD | AT91C_SMC2_DBW_8 | -- SM_TDF | AT91C_SMC2_WSEN | SM_NWS); -+ -+#define SMARTMEDIA_INIT ( \ -+ SM_RWH | \ -+ SM_RWS | \ -+ AT91C_SMC2_ACSS_STANDARD | \ -+ AT91C_SMC2_DBW_8 | \ -+ SM_TDF | \ -+ AT91C_SMC2_WSEN | \ -+ SM_NWS \ -+ ) -+ -+ -+ -+#define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */ -+void nand_init (void) -+{ -+ /* Setup Smart Media, fitst enable the address range of CS3 */ -+ /* *AT91C_EBI_CSA |= AT91C_EBI_CS3A_SMC_SmartMedia; */ -+ at91_sys_setbit(AT91C_EBI_CS3A_SMC_SmartMedia, AT91_EBI_CSA); -+ -+ /* Init Smartmedia Interface */ -+ at91_sys_write(AT91_SMC2_CSR3, SMARTMEDIA_INIT); - - /* enable the SMOE line PC0=SMCE, A21=CLE, A22=ALE */ -- *AT91C_PIOC_ASR = AT91C_PC0_BFCK | AT91C_PC1_BFRDY_SMOE | -- AT91C_PC3_BFBAA_SMWE; -- *AT91C_PIOC_PDR = AT91C_PC0_BFCK | AT91C_PC1_BFRDY_SMOE | -- AT91C_PC3_BFBAA_SMWE; -+ at91_set_A_periph(AT91_PIN_PC0, 0); /* BFCK */ -+ at91_set_A_periph(AT91_PIN_PC1, 0); /* BFRDY/SMOE */ -+ at91_set_A_periph(AT91_PIN_PC3, 0); /* BFBAA/SMWE */ - - /* Configure PC2 as input (signal READY of the SmartMedia) */ -- *AT91C_PIOC_PER = AT91C_PC2_BFAVD; /* enable direct output enable */ -- *AT91C_PIOC_ODR = AT91C_PC2_BFAVD; /* disable output */ -+ at91_set_gpio_input(AT91_PIN_PC2, 0); - - /* Configure PB1 as input (signal Card Detect of the SmartMedia) */ -- *AT91C_PIOB_PER = AT91C_PIO_PB1; /* enable direct output enable */ -- *AT91C_PIOB_ODR = AT91C_PIO_PB1; /* disable output */ -+ at91_set_gpio_input(AT91_PIN_PB1, 0); - - /* PIOB and PIOC clock enabling */ -- *AT91C_PMC_PCER = 1 << AT91C_ID_PIOB; -- *AT91C_PMC_PCER = 1 << AT91C_ID_PIOC; -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91RM9200_ID_PIOB); -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91RM9200_ID_PIOC); - -- if (*AT91C_PIOB_PDSR & AT91C_PIO_PB1) -+ if (at91_get_gpio_value(AT91_PIN_PB1)) - printf (" No SmartMedia card inserted\n"); - #ifdef DEBUG - printf (" SmartMedia card inserted\n"); -@@ -140,3 +159,4 @@ - printf ("%4lu MB\n", nand_probe(AT91_SMARTMEDIA_BASE) >> 20); - } - #endif -+ -diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/led.c u-boot-2009.01/board/atmel/at91rm9200dk/led.c ---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/led.c 2009-01-01 13:09:31.000000000 +0100 -+++ u-boot-2009.01/board/atmel/at91rm9200dk/led.c 2009-01-01 15:53:56.000000000 +0100 -@@ -24,57 +24,105 @@ - - #include <common.h> - #include <asm/arch/AT91RM9200.h> -+/*#include <asm/arch/at91_pmc.h>*/ -+#include <asm/arch/gpio.h> -+#include <asm/arch/io.h> - --#define GREEN_LED AT91C_PIO_PB0 --#define YELLOW_LED AT91C_PIO_PB1 --#define RED_LED AT91C_PIO_PB2 -+#define GREEN_LED AT91_PIN_PB0 -+#define YELLOW_LED AT91_PIN_PB1 -+#define RED_LED AT91_PIN_PB2 - --void green_LED_on(void) -+ -+#define GREEN_LED_ON 0 -+#define GREEN_LED_OFF 1 -+#define YELLOW_LED_ON 0 -+#define YELLOW_LED_OFF 1 -+#define RED_LED_ON 0 -+#define RED_LED_OFF 1 -+ -+#define TIME_SLICE 500000 -+ -+void yellow_LED_on(void) -+{ -+ at91_set_gpio_value(YELLOW_LED, YELLOW_LED_ON); -+} -+ -+void yellow_LED_off(void) -+{ -+ at91_set_gpio_value(YELLOW_LED, YELLOW_LED_OFF); -+} -+ -+void red_LED_on(void) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_CODR = GREEN_LED; -+ at91_set_gpio_value(RED_LED, RED_LED_ON); - } - --void yellow_LED_on(void) -+void red_LED_off(void) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_CODR = YELLOW_LED; -+ at91_set_gpio_value(RED_LED, RED_LED_OFF); - } - --void red_LED_on(void) -+void green_LED_on(void) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_CODR = RED_LED; -+ at91_set_gpio_value(GREEN_LED, GREEN_LED_ON); - } - --void green_LED_off(void) -+void green_LED_off(void) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_SODR = GREEN_LED; -+ at91_set_gpio_value(GREEN_LED, GREEN_LED_OFF); - } - --void yellow_LED_off(void) -+static void delay(unsigned int time) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_SODR = YELLOW_LED; -+ volatile unsigned int counter = time; -+ while(counter > 0) counter--; - } - --void red_LED_off(void) -+void green_LED_blink(unsigned int time) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- PIOB->PIO_SODR = RED_LED; -+ while(time > 0) { -+ green_LED_on(); -+ delay(TIME_SLICE); -+ green_LED_off(); -+ delay(TIME_SLICE); -+ time--; -+ } - } - -+void yellow_LED_blink(unsigned int time) -+{ -+ while(time > 0) { -+ yellow_LED_on(); -+ delay(TIME_SLICE); -+ yellow_LED_off(); -+ delay(TIME_SLICE); -+ time--; -+ } -+} - --void coloured_LED_init (void) -+void red_LED_blink(unsigned int time) - { -- AT91PS_PIO PIOB = AT91C_BASE_PIOB; -- AT91PS_PMC PMC = AT91C_BASE_PMC; -- PMC->PMC_PCER = (1 << AT91C_ID_PIOB); /* Enable PIOB clock */ -- /* Disable peripherals on LEDs */ -- PIOB->PIO_PER = AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0; -- /* Enable pins as outputs */ -- PIOB->PIO_OER = AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0; -- /* Turn all LEDs OFF */ -- PIOB->PIO_SODR = AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0; -+ while(time > 0) { -+ red_LED_on(); -+ delay(TIME_SLICE); -+ red_LED_off(); -+ delay(TIME_SLICE); -+ time--; -+ } - } -+ -+void coloured_LED_init(void) -+{ -+ /* Enable clock */ -+ at91_sys_write(AT91C_PMC_PCER, 1 << AT91RM9200_ID_PIOB); -+ -+ at91_set_gpio_output(GREEN_LED, 1); -+ at91_set_gpio_output(YELLOW_LED, 1); -+ at91_set_gpio_output(RED_LED, 1); -+ -+ at91_set_gpio_value(GREEN_LED, GREEN_LED_OFF); -+ at91_set_gpio_value(YELLOW_LED, YELLOW_LED_OFF); -+ at91_set_gpio_value(RED_LED, RED_LED_ON); -+} -+ -+ -diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/mux.c u-boot-2009.01/board/atmel/at91rm9200dk/mux.c ---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/mux.c 2009-01-01 13:09:31.000000000 +0100 -+++ u-boot-2009.01/board/atmel/at91rm9200dk/mux.c 2009-01-01 16:38:01.000000000 +0100 -@@ -1,37 +1,29 @@ - #include <config.h> - #include <common.h> - #include <asm/hardware.h> -+#include <asm/arch/at91_pio.h> -+#include <asm/arch/gpio.h> -+#include <asm/arch/io.h> - #include <dataflash.h> - - int AT91F_GetMuxStatus(void) { --#ifdef DATAFLASH_MMC_SELECT -- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */ -- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */ -- -- -- if(AT91C_BASE_PIOB->PIO_ODSR & DATAFLASH_MMC_SELECT) { -- return 1; -- } else { -- return 0; -- } --#endif -+#ifdef CONFIG_CMD_AT91_SPIMUX -+ return at91_get_gpio_value(DATAFLASH_MMC_SELECT); -+#else - return 0; -+#endif - } - --void AT91F_SelectMMC(void) { --#ifdef DATAFLASH_MMC_SELECT -- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */ -- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */ -- /* Set Output */ -- AT91C_BASE_PIOB->PIO_SODR = DATAFLASH_MMC_SELECT; -+void AT91F_SelectMMC(void) -+{ -+#ifdef CONFIG_CMD_AT91_SPIMUX -+ at91_set_gpio_output(DATAFLASH_MMC_SELECT, 1); /* Set in PIO mode and select SD-Card*/ - #endif - } - - void AT91F_SelectSPI(void) { --#ifdef DATAFLASH_MMC_SELECT -- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */ -- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */ -- /* Clear Output */ -- AT91C_BASE_PIOB->PIO_CODR = DATAFLASH_MMC_SELECT; -+#ifdef CONFIG_CMD_AT91_SPIMUX -+ at91_set_gpio_output(DATAFLASH_MMC_SELECT, 0); /* Set in PIO mode and select SPI */ - #endif - } -+ - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch deleted file mode 100644 index 4d22c53..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch +++ /dev/null @@ -1,536 +0,0 @@ -diff -urN u-boot-2009.01-0rig/include/configs/at91rm9200df.h u-boot-2009.01/include/configs/at91rm9200df.h ---- u-boot-2009.01-0rig/include/configs/at91rm9200df.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200df.h 2009-01-01 21:19:17.000000000 +0100 -@@ -0,0 +1,261 @@ -+/* -+ * Rick Bronson <rick@efn.org> -+ * -+ * Ulf Samuelsson <ulf.samuelsson@atmel.com> -+ * -+ * Configuration settings for the AT91RM9200EK board. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+#define AT91RM9200_BOARD MACH_TYPE_AT91RM9200DF -+#define CONFIG_HOSTNAME at91rm9200df -+/* ARM asynchronous clock */ -+#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ -+#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ -+/* #define AT91C_MASTER_CLOCK 44928000 */ /* peripheral clock (AT91C_MASTER_CLOCK / 4) */ -+ -+#define AT91_SLOW_CLOCK 32768 /* slow clock */ -+ -+#define CONFIG_ARM920T 1 /* This is an ARM920T Core */ -+#define CONFIG_AT91 1 /* THis is an ARM from the AT91 family */ -+#define CONFIG_AT91RM9200 1 /* It's an Atmel AT91RM9200 SoC */ -+#define CONFIG_AT91RM9200DF 1 /* Generic AT91RM9200 Board running from Dataflashcard */ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+#define USE_920T_MMU 1 -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT /* Already done by dataflashboot */ -+ -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_INITRD_TAG 1 -+ -+#ifndef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 -+/* flash */ -+#define MC_PUIA_VAL 0x00000000 -+#define MC_PUP_VAL 0x00000000 -+#define MC_PUER_VAL 0x00000000 -+#define MC_ASR_VAL 0x00000000 -+#define MC_AASR_VAL 0x00000000 -+#define EBI_CFGR_VAL 0x00000000 -+#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ -+ -+/* clocks */ -+#define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */ -+#define PLLBR_VAL 0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */ -+#define MCKR_VAL 0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */ -+ -+/* sdram */ -+#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */ -+#define PIOC_BSR_VAL 0x00000000 -+#define PIOC_PDR_VAL 0xFFFF0000 -+#define EBI_CSA_VAL 0x00000002 /* CS1=SDRAM */ -+#define SDRC_CR_VAL 0x2188c155 /* set up the SDRAM */ -+#define SDRAM 0x20000000 /* address of the SDRAM */ -+#define SDRAM1 0x20000080 /* address of the SDRAM */ -+#define SDRAM_VAL 0x00000000 /* value written to SDRAM */ -+#define SDRC_MR_VAL 0x00000002 /* Precharge All */ -+#define SDRC_MR_VAL1 0x00000004 /* refresh */ -+#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ -+#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */ -+#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -+#else -+#define CONFIG_SKIP_RELOCATE_UBOOT -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+/* -+ * Size of malloc() pool -+ */ -+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -+#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+#define CONFIG_BAUDRATE 115200 -+ -+/* -+ * Hardware drivers -+ */ -+ -+/* define one of these to choose the DBGU, USART0 or USART1 as console */ -+#define CONFIG_DBGU -+#undef CONFIG_USART0 -+#undef CONFIG_USART1 -+ -+#undef CONFIG_HWFLOW /* don't include RTS/CTS flow control support */ -+ -+#undef CONFIG_MODEM_SUPPORT /* disable modem initialization stuff */ -+ -+#define CONFIG_BOOTDELAY 3 -+/* #define CONFIG_ENV_OVERWRITE 1 */ -+ -+ -+/* -+ * BOOTP options -+ */ -+#define CONFIG_BOOTP_BOOTFILESIZE -+#define CONFIG_BOOTP_BOOTPATH -+#define CONFIG_BOOTP_GATEWAY -+#define CONFIG_BOOTP_HOSTNAME -+ -+ -+/* -+ * Command line configuration. -+ */ -+#include <config_cmd_default.h> -+ -+#define CONFIG_CMD_DHCP -+#define CONFIG_CMD_MII -+#define CONFIG_CMD_NAND -+#define CONFIG_CMD_AT91_SPIMUX -+#define CONFIG_CMD_ETHINIT -+ -+#define CONFIG_DOS_PARTITION 1 -+#define CONFIG_MMC 1 -+#define CONFIG_SUPPORT_VFAT 1 -+#define CONFIG__MMC_BASE 0xFFFB4000 /* From AT91RM9200.h*/ -+#define CONFIG__MMC_BLOCKSIZE 512 -+ -+#define CONFIG_NAND_LEGACY -+ -+#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define SECTORSIZE 512 -+ -+#define ADDR_COLUMN 1 -+#define ADDR_PAGE 2 -+#define ADDR_COLUMN_PAGE 3 -+ -+#define NAND_ChipID_UNKNOWN 0x00 -+#define NAND_MAX_FLOORS 1 -+#define NAND_MAX_CHIPS 1 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 22) /* our ALE is AD22 */ -+#define AT91_SMART_MEDIA_CLE (1 << 21) /* our CLE is AD21 */ -+ -+#include <asm/arch/AT91RM9200.h> /* needed for port definitions */ -+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0) -+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0) -+ -+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2)) -+ -+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0) -+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0) -+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0) -+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr)) -+/* the following are NOP's in our implementation */ -+#define NAND_CTL_CLRALE(nandptr) -+#define NAND_CTL_SETALE(nandptr) -+#define NAND_CTL_CLRCLE(nandptr) -+#define NAND_CTL_SETCLE(nandptr) -+ -+#define CONFIG_NR_DRAM_BANKS 1 -+#define PHYS_SDRAM 0x20000000 -+#define PHYS_SDRAM_SIZE 0x2000000 /* 32 megs */ -+ -+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -+#define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144 -+ -+#define CONFIG_DRIVER_ETHER -+#define CONFIG_NET_RETRY_COUNT 20 -+#define CONFIG_AT91C_USE_RMII -+ -+/* AC Characteristics */ -+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */ -+#define DATAFLASH_TCSS (0xC << 16) -+#define DATAFLASH_TCHS (0x1 << 24) -+ -+#define CONFIG_HAS_DATAFLASH 1 -+#undef BOARD_LATE_INIT -+ -+#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) -+#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 -+#define CONFIG_SYS_MAX_DATAFLASH_PAGES 16384 -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* Logical adress for CS0 */ -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 0xD0000000 /* Logical adress for CS3 */ -+#define CONFIG__SUPPORT_BLOCK_ERASE 1 -+ -+#define PHYS_FLASH_1 0x10000000 -+#define PHYS_FLASH_SIZE 0x800000 /* 2 megs main flash */ -+#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_MAX_FLASH_BANKS 1 -+#define CONFIG_SYS_MAX_FLASH_SECT 256 -+#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -+#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -+ -+#define CONFIG_ENV_IS_IN_DATAFLASH -+#define CONFIG_NEW_PARTITION 1 -+ -+#ifdef CONFIG_ENV_IS_IN_DATAFLASH -+#ifdef CONFIG_NEW_PARTITION -+#define CONFIG_ENV_OFFSET 0x21000 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x2000 /* 8 * 1056 really , but start.s is not OK with this*/ -+#else -+#define CONFIG_ENV_OFFSET 0x20000 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#endif -+#else -+#define CONFIG_ENV_IS_IN_FLASH 1 -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#else -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ -+#define CONFIG_ENV_SIZE 0x10000 /* sectors are 64K here */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */ -+ -+#if defined(CONFIG_AT91RM9200DK) -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB7 -+#else -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB22 -+#endif -+ -+#define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ -+ -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_BOOT_SIZE 0x6000 /* 24 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) -+#define CONFIG_SYS_U_BOOT_SIZE 0x10000 /* 64 KBytes */ -+#else -+#define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_U_BOOT_SIZE 0x60000 /* 384 KBytes */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+ -+#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 } -+ -+#define CONFIG_SYS_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -+ -+#define CONFIG_SYS_HZ 1000 -+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2 /* AT91C_TC0_CMR is implicitly set to */ -+ /* AT91C_TC_TIMER_DIV1_CLOCK */ -+ -+#define CONFIG_STACKSIZE (32*1024) /* regular stack */ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) -+ -+#ifdef CONFIG_USE_IRQ -+#error CONFIG_USE_IRQ not supported -+#endif -+#endif -diff -urN u-boot-2009.01-0rig/include/configs/at91rm9200ek.h u-boot-2009.01/include/configs/at91rm9200ek.h ---- u-boot-2009.01-0rig/include/configs/at91rm9200ek.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200ek.h 2009-01-01 17:13:31.000000000 +0100 -@@ -0,0 +1,251 @@ -+/* -+ * Rick Bronson <rick@efn.org> -+ * -+ * Ulf Samuelsson <ulf.samuelsson@atmel.com> -+ * -+ * Configuration settings for the AT91RM9200EK board. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+#define AT91RM9200_BOARD MACH_TYPE_AT91RM9200EK -+#define CONFIG_HOSTNAME at91rm9200ek -+/* ARM asynchronous clock */ -+#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ -+#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ -+/* #define AT91C_MASTER_CLOCK 44928000 */ /* peripheral clock (AT91C_MASTER_CLOCK / 4) */ -+ -+#define AT91_SLOW_CLOCK 32768 /* slow clock */ -+ -+#define CONFIG_ARM920T 1 /* This is an ARM920T Core */ -+#define CONFIG_AT91 1 /* THis is an ARM from the AT91 family */ -+#define CONFIG_AT91RM9200 1 /* It's an Atmel AT91RM9200 SoC */ -+#define CONFIG_AT91RM9200EK 1 /* on an AT91RM9200EK Board */ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+#define USE_920T_MMU 1 -+ -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_INITRD_TAG 1 -+ -+#ifndef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 -+/* flash */ -+#define MC_PUIA_VAL 0x00000000 -+#define MC_PUP_VAL 0x00000000 -+#define MC_PUER_VAL 0x00000000 -+#define MC_ASR_VAL 0x00000000 -+#define MC_AASR_VAL 0x00000000 -+#define EBI_CFGR_VAL 0x00000000 -+#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ -+ -+/* clocks */ -+#define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */ -+#define PLLBR_VAL 0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */ -+#define MCKR_VAL 0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */ -+ -+/* sdram */ -+#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */ -+#define PIOC_BSR_VAL 0x00000000 -+#define PIOC_PDR_VAL 0xFFFF0000 -+#define EBI_CSA_VAL 0x00000002 /* CS1=SDRAM */ -+#define SDRC_CR_VAL 0x2188c155 /* set up the SDRAM */ -+#define SDRAM 0x20000000 /* address of the SDRAM */ -+#define SDRAM1 0x20000080 /* address of the SDRAM */ -+#define SDRAM_VAL 0x00000000 /* value written to SDRAM */ -+#define SDRC_MR_VAL 0x00000002 /* Precharge All */ -+#define SDRC_MR_VAL1 0x00000004 /* refresh */ -+#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ -+#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */ -+#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -+#else -+#define CONFIG_SKIP_RELOCATE_UBOOT -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+/* -+ * Size of malloc() pool -+ */ -+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -+#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+#define CONFIG_BAUDRATE 115200 -+ -+/* -+ * Hardware drivers -+ */ -+ -+/* define one of these to choose the DBGU, USART0 or USART1 as console */ -+#define CONFIG_DBGU -+#undef CONFIG_USART0 -+#undef CONFIG_USART1 -+ -+#undef CONFIG_HWFLOW /* don't include RTS/CTS flow control support */ -+ -+#undef CONFIG_MODEM_SUPPORT /* disable modem initialization stuff */ -+ -+#define CONFIG_BOOTDELAY 3 -+/* #define CONFIG_ENV_OVERWRITE 1 */ -+ -+ -+/* -+ * BOOTP options -+ */ -+#define CONFIG_BOOTP_BOOTFILESIZE -+#define CONFIG_BOOTP_BOOTPATH -+#define CONFIG_BOOTP_GATEWAY -+#define CONFIG_BOOTP_HOSTNAME -+ -+ -+/* -+ * Command line configuration. -+ */ -+#include <config_cmd_default.h> -+ -+#define CONFIG_CMD_DHCP -+#define CONFIG_CMD_MII -+#define CONFIG_CMD_NAND -+#define CONFIG_CMD_AT91_SPIMUX -+#define CONFIG_CMD_ETHINIT -+ -+#define CONFIG_NAND_LEGACY -+ -+#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define SECTORSIZE 512 -+ -+#define ADDR_COLUMN 1 -+#define ADDR_PAGE 2 -+#define ADDR_COLUMN_PAGE 3 -+ -+#define NAND_ChipID_UNKNOWN 0x00 -+#define NAND_MAX_FLOORS 1 -+#define NAND_MAX_CHIPS 1 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 22) /* our ALE is AD22 */ -+#define AT91_SMART_MEDIA_CLE (1 << 21) /* our CLE is AD21 */ -+ -+#include <asm/arch/AT91RM9200.h> /* needed for port definitions */ -+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0) -+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0) -+ -+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2)) -+ -+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0) -+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0) -+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0) -+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr)) -+/* the following are NOP's in our implementation */ -+#define NAND_CTL_CLRALE(nandptr) -+#define NAND_CTL_SETALE(nandptr) -+#define NAND_CTL_CLRCLE(nandptr) -+#define NAND_CTL_SETCLE(nandptr) -+ -+#define CONFIG_NR_DRAM_BANKS 1 -+#define PHYS_SDRAM 0x20000000 -+#define PHYS_SDRAM_SIZE 0x2000000 /* 32 megs */ -+ -+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -+#define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144 -+ -+#define CONFIG_DRIVER_ETHER -+#define CONFIG_NET_RETRY_COUNT 20 -+#define CONFIG_AT91C_USE_RMII -+ -+/* AC Characteristics */ -+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */ -+#define DATAFLASH_TCSS (0xC << 16) -+#define DATAFLASH_TCHS (0x1 << 24) -+ -+#define CONFIG_HAS_DATAFLASH 1 -+#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) -+#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 -+#define CONFIG_SYS_MAX_DATAFLASH_PAGES 16384 -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* Logical adress for CS0 */ -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 0xD0000000 /* Logical adress for CS3 */ -+#define CONFIG__SUPPORT_BLOCK_ERASE 1 -+ -+#define PHYS_FLASH_1 0x10000000 -+#define PHYS_FLASH_SIZE 0x800000 /* 2 megs main flash */ -+#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_MAX_FLASH_BANKS 1 -+#define CONFIG_SYS_MAX_FLASH_SECT 256 -+#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -+#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -+ -+#undef CONFIG_ENV_IS_IN_DATAFLASH -+#define CONFIG_NEW_PARTITION 1 -+ -+#ifdef CONFIG_ENV_IS_IN_DATAFLASH -+#ifdef CONFIG_NEW_PARTITION -+#define CONFIG__ENV_OFFSET 0x21000 -+#define CONFIG__ENV_ADDR (CONFIG_SYS__DATAFLASH_LOGIC_ADDR_CS0 + CONFIG__ENV_OFFSET) -+#define CONFIG__ENV_SIZE 0x2000 /* 8 * 1056 really , but start.s is not OK with this*/ -+> #else -+#define CONFIG_ENV_OFFSET 0x20000 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#endif -+#else -+#define CONFIG_ENV_IS_IN_FLASH 1 -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ -+#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ -+#else -+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ -+#define CONFIG_ENV_SIZE 0x10000 /* sectors are 64K here */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */ -+ -+#if defined(CONFIG_AT91RM9200DK) -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB7 -+#else -+#define DATAFLASH_MMC_SELECT AT91_PIN_PB22 -+#endif -+ -+#define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ -+ -+#ifdef CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SYS_BOOT_SIZE 0x6000 /* 24 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) -+#define CONFIG_SYS_U_BOOT_SIZE 0x10000 /* 64 KBytes */ -+#else -+#define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ -+#define CONFIG_SYS_U_BOOT_BASE PHYS_FLASH_1 -+#define CONFIG_SYS_U_BOOT_SIZE 0x60000 /* 384 KBytes */ -+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ -+ -+#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 } -+ -+#define CONFIG_SYS_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -+ -+#define CONFIG_SYS_HZ 1000 -+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2 /* AT91C_TC0_CMR is implicitly set to */ -+ /* AT91C_TC_TIMER_DIV1_CLOCK */ -+ -+#define CONFIG_STACKSIZE (32*1024) /* regular stack */ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) -+ -+#ifdef CONFIG_USE_IRQ -+#error CONFIG_USE_IRQ not supported -+#endif -+#endif -diff -urN u-boot-2009.01-0rig/Makefile u-boot-2009.01/Makefile ---- u-boot-2009.01-0rig/Makefile 2009-01-02 10:03:11.000000000 +0100 -+++ u-boot-2009.01/Makefile 2009-01-01 21:31:34.000000000 +0100 -@@ -2568,6 +2568,12 @@ - at91rm9200dk_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 - -+at91rm9200df_config : unconfig -+ @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 -+ -+at91rm9200ek_config : unconfig -+ @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 -+ - cmc_pu2_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch deleted file mode 100644 index b87a655..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch +++ /dev/null @@ -1,801 +0,0 @@ -diff -urN u-boot-2008.10-0rig/Makefile u-boot-2008.10/Makefile ---- u-boot-2008.10-0rig/Makefile 2008-12-28 14:07:30.000000000 +0100 -+++ u-boot-2008.10/Makefile 2008-12-28 14:06:28.000000000 +0100 -@@ -2541,6 +2541,22 @@ - fi; - @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 - -+at91sam9g20ek_nandflash_config \ -+at91sam9g20ek_dataflash_cs0_config \ -+at91sam9g20ek_dataflash_cs1_config \ -+at91sam9g20ek_config : unconfig -+ @if [ "$(findstring _nandflash,$@)" ] ; then \ -+ echo "#define CONFIG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in NAND FLASH" ; \ -+ elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ -+ echo "#define CONFIG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ -+ else \ -+ echo "#define CONFIG_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ -+ fi; -+ @$(MKCONFIG) -a at91sam9g20ek arm arm926ejs at91sam9g20ek atmel at91 -+ - at91sam9261ek_nandflash_config \ - at91sam9261ek_dataflash_cs0_config \ - at91sam9261ek_dataflash_cs3_config \ -Index: include/configs/at91sam9g20ek.h -=================================================================== ---- a/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4) (revision 0) -+++ b/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,198 @@ -+/* -+ * (C) Copyright 2007-2008 -+ * Stelian Pop <stelian.pop@leadtechdesign.com> -+ * Lead Tech Design <www.leadtechdesign.com> -+ * -+ * Configuation settings for the AT91SAM9G20EK board. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ -+/* ARM asynchronous clock */ -+#define AT91_MAIN_CLOCK 396288000 /* from 18.432 MHz crystal */ -+#define AT91_MASTER_CLOCK 132096000 /* peripheral = main / 3 */ -+#define CONFIG_SYS_HZ 1000000 /* 1us resolution */ -+ -+#define AT91_SLOW_CLOCK 32768 /* slow clock */ -+ -+#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ -+#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ -+#define CONFIG_AT91SAM9G20EK 1 /* on an AT91SAM9G20EK Board */ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+ -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_INITRD_TAG 1 -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT -+#define CONFIG_SKIP_RELOCATE_UBOOT -+ -+/* -+ * Hardware drivers -+ */ -+#define CONFIG_ATMEL_USART 1 -+#undef CONFIG_USART0 -+#undef CONFIG_USART1 -+#undef CONFIG_USART2 -+#define CONFIG_USART3 1 /* USART 3 is DBGU */ -+ -+#define CONFIG_BOOTDELAY 3 -+ -+/* -+ * BOOTP options -+ */ -+#define CONFIG_BOOTP_BOOTFILESIZE 1 -+#define CONFIG_BOOTP_BOOTPATH 1 -+#define CONFIG_BOOTP_GATEWAY 1 -+#define CONFIG_BOOTP_HOSTNAME 1 -+ -+/* -+ * Command line configuration. -+ */ -+#include <config_cmd_default.h> -+#undef CONFIG_CMD_BDI -+#undef CONFIG_CMD_IMI -+#undef CONFIG_CMD_AUTOSCRIPT -+#undef CONFIG_CMD_FPGA -+#undef CONFIG_CMD_LOADS -+#undef CONFIG_CMD_IMLS -+ -+#define CONFIG_CMD_PING 1 -+#define CONFIG_CMD_DHCP 1 -+#define CONFIG_CMD_NAND -+#define CONFIG_CMD_USB 1 -+ -+/* SDRAM */ -+#define CONFIG_NR_DRAM_BANKS 1 -+#define PHYS_SDRAM 0x20000000 -+#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ -+ -+/* DataFlash */ -+#define CONFIG_HAS_DATAFLASH 1 -+#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) -+#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ -+#define AT91_SPI_CLK 15000000 -+#define DATAFLASH_TCSS (0x22 << 16) -+#define DATAFLASH_TCHS (0x1 << 24) -+#define AT91SAM9260_BASE_SPI0 0xfffc8000 -+/* NAND flash */ -+#define NAND_MAX_CHIPS 1 -+#define CONFIG_SYS_MAX_NAND_DEVICE 1 -+#define CONFIG_SYS_NAND_BASE 0x40000000 -+#define CONFIG_SYS_NAND_DBW_8 1 -+ -+/* NOR flash - no real flash on this board */ -+#define CONFIG_SYS_NO_FLASH 1 -+ -+/* Ethernet */ -+#define CONFIG_MACB 1 -+#define CONFIG_RMII 1 -+#define CONFIG_NET_MULTI 1 -+#define CONFIG_NET_RETRY_COUNT 20 -+#define CONFIG_RESET_PHY_R 1 -+#define AT91SAM9260_BASE_EMAC 0xfffc4000 -+/* USB */ -+#define CONFIG_USB_OHCI_NEW 1 -+#define LITTLEENDIAN 1 -+#define CONFIG_DOS_PARTITION 1 -+#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 -+#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9G20_UHP_BASE */ -+#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g20" -+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -+#define CONFIG_USB_STORAGE 1 -+ -+#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -+ -+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -+#define CONFIG_SYS_MEMTEST_END 0x23e00000 -+ -+#ifdef CONFIG_USE_DATAFLASH_CS0 -+ -+/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -+#define CONFIG_ENV_IS_IN_DATAFLASH 1 -+#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -+#define CONFIG_ENV_OFFSET 0x4200 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x4200 -+#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ -+ "root=/dev/mtdblock0 " \ -+ "mtdparts=at91_nand:-(root) " \ -+ "rw rootfstype=jffs2" -+ -+#elif CONFIG_USE_DATAFLASH_CS1 -+ -+/* bootstrap + u-boot + env + linux in dataflash on CS1 */ -+#define CONFIG_ENV_IS_IN_DATAFLASH 1 -+#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) -+#define CONFIG_ENV_OFFSET 0x4200 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_SIZE 0x4200 -+#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ -+ "root=/dev/mtdblock0 " \ -+ "mtdparts=at91_nand:-(root) " \ -+ "rw rootfstype=jffs2" -+ -+#else /* CONFIG_USE_NANDFLASH */ -+ -+/* bootstrap + u-boot + env + linux in nandflash */ -+#define CONFIG_ENV_IS_IN_NAND 1 -+#define CONFIG_ENV_OFFSET 0x60000 -+#define CONFIG_ENV_OFFSET_REDUND 0x80000 -+#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ -+#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ -+ "root=/dev/mtdblock5 " \ -+ "mtdparts=at91_nand:128k(bootstrap)ro," \ -+ "256k(uboot)ro,128k(env1)ro," \ -+ "128k(env2)ro,2M(linux),-(root) " \ -+ "rw rootfstype=jffs2" -+ -+#endif -+ -+#define CONFIG_BAUDRATE 115200 -+#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } -+ -+#define CONFIG_SYS_PROMPT "U-Boot> " -+#define CONFIG_SYS_CBSIZE 256 -+#define CONFIG_SYS_MAXARGS 16 -+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -+#define CONFIG_SYS_LONGHELP 1 -+#define CONFIG_CMDLINE_EDITING 1 -+ -+#define ROUND(A, B) (((A) + (B)) & ~((B) - 1)) -+/* -+ * Size of malloc() pool -+ */ -+#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -+#define CONFIG_SYS_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ -+ -+#define CONFIG_STACKSIZE (32*1024) /* regular stack */ -+ -+#ifdef CONFIG_USE_IRQ -+#error CONFIG_USE_IRQ not supported -+#endif -+ -+#endif -Index: board/atmel/at91sam9g20ek/nand.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,78 @@ -+/* -+ * (C) Copyright 2007-2008 -+ * Stelian Pop <stelian.pop@leadtechdesign.com> -+ * Lead Tech Design <www.leadtechdesign.com> -+ * -+ * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <common.h> -+#include <asm/arch/at91sam9260.h> -+#include <asm/arch/gpio.h> -+#include <asm/arch/at91_pio.h> -+ -+#include <nand.h> -+ -+/* -+ * hardware specific access to control-lines -+ */ -+#define MASK_ALE (1 << 21) /* our ALE is AD21 */ -+#define MASK_CLE (1 << 22) /* our CLE is AD22 */ -+ -+static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd, -+ int cmd, unsigned int ctrl) -+{ -+ struct nand_chip *this = mtd->priv; -+ -+ if (ctrl & NAND_CTRL_CHANGE) { -+ ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; -+ IO_ADDR_W &= ~(MASK_ALE | MASK_CLE); -+ -+ if (ctrl & NAND_CLE) -+ IO_ADDR_W |= MASK_CLE; -+ if (ctrl & NAND_ALE) -+ IO_ADDR_W |= MASK_ALE; -+ -+ at91_set_gpio_value(AT91_PIN_PC14, !(ctrl & NAND_NCE)); -+ this->IO_ADDR_W = (void *) IO_ADDR_W; -+ } -+ -+ if (cmd != NAND_CMD_NONE) -+ writeb(cmd, this->IO_ADDR_W); -+} -+ -+static int at91sam9g20ek_nand_ready(struct mtd_info *mtd) -+{ -+ return at91_get_gpio_value(AT91_PIN_PC13); -+} -+ -+int board_nand_init(struct nand_chip *nand) -+{ -+ nand->ecc.mode = NAND_ECC_SOFT; -+#ifdef CONFIG_SYS_NAND_DBW_16 -+ nand->options = NAND_BUSWIDTH_16; -+#endif -+ nand->cmd_ctrl = at91sam9g20ek_nand_hwcontrol; -+ nand->dev_ready = at91sam9g20ek_nand_ready; -+ nand->chip_delay = 20; -+ -+ return 0; -+} -Index: board/atmel/at91sam9g20ek/at91sam9g20ek.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,250 @@ -+/* -+ * (C) Copyright 2007-2008 -+ * Stelian Pop <stelian.pop@leadtechdesign.com> -+ * Lead Tech Design <www.leadtechdesign.com> -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <common.h> -+#include <asm/arch/at91sam9260.h> -+#include <asm/arch/at91sam9260_matrix.h> -+#include <asm/arch/at91sam9_smc.h> -+#include <asm/arch/at91_pmc.h> -+#include <asm/arch/at91_rstc.h> -+#include <asm/arch/gpio.h> -+#include <asm/arch/io.h> -+#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) -+#include <net.h> -+#endif -+#include <netdev.h> -+DECLARE_GLOBAL_DATA_PTR; -+ -+/* ------------------------------------------------------------------------- */ -+/* -+ * Miscelaneous platform dependent initialisations -+ */ -+ -+static void at91sam9g20ek_serial_hw_init(void) -+{ -+#ifdef CONFIG_USART0 -+ at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ -+ at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0); -+#endif -+ -+#ifdef CONFIG_USART1 -+ at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ -+ at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1); -+#endif -+ -+#ifdef CONFIG_USART2 -+ at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ -+ at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2); -+#endif -+ -+#ifdef CONFIG_USART3 /* DBGU */ -+ at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ -+ at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -+#endif -+} -+ -+#ifdef CONFIG_CMD_NAND -+static void at91sam9g20ek_nand_hw_init(void) -+{ -+ unsigned long csa; -+ -+ /* Enable CS3 */ -+ csa = at91_sys_read(AT91_MATRIX_EBICSA); -+ at91_sys_write(AT91_MATRIX_EBICSA, -+ csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); -+ -+ /* Configure SMC CS3 for NAND/SmartMedia */ -+ at91_sys_write(AT91_SMC_SETUP(3), -+ AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | -+ AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); -+ at91_sys_write(AT91_SMC_PULSE(3), -+ AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(3) | -+ AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(3)); -+ at91_sys_write(AT91_SMC_CYCLE(3), -+ AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7)); -+ at91_sys_write(AT91_SMC_MODE(3), -+ AT91_SMC_READMODE | AT91_SMC_WRITEMODE | -+ AT91_SMC_EXNWMODE_DISABLE | -+#ifdef CONFIG_SYS_NAND_DBW_16 -+ AT91_SMC_DBW_16 | -+#else /* CONFIG_SYS_NAND_DBW_8 */ -+ AT91_SMC_DBW_8 | -+#endif -+ AT91_SMC_TDF_(3)); -+ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); -+ -+ /* Configure RDY/BSY */ -+ at91_set_gpio_input(AT91_PIN_PC13, 1); -+ -+ /* Enable NandFlash */ -+ at91_set_gpio_output(AT91_PIN_PC14, 1); -+} -+#endif -+ -+#ifdef CONFIG_HAS_DATAFLASH -+static void at91sam9g20ek_spi_hw_init(void) -+{ -+ at91_set_A_periph(AT91_PIN_PA3, 0); /* SPI0_NPCS0 */ -+ at91_set_B_periph(AT91_PIN_PC11, 0); /* SPI0_NPCS1 */ -+ -+ at91_set_A_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ -+ at91_set_A_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ -+ at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ -+ -+ /* Enable clock */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0); -+} -+#endif -+ -+#ifdef CONFIG_MACB -+static void at91sam9g20ek_macb_hw_init(void) -+{ -+ /* Enable clock */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC); -+ -+ /* -+ * Disable pull-up on: -+ * RXDV (PA17) => PHY normal mode (not Test mode) -+ * ERX0 (PA14) => PHY ADDR0 -+ * ERX1 (PA15) => PHY ADDR1 -+ * ERX2 (PA25) => PHY ADDR2 -+ * ERX3 (PA26) => PHY ADDR3 -+ * ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 -+ * -+ * PHY has internal pull-down -+ */ -+ writel(pin_to_mask(AT91_PIN_PA14) | -+ pin_to_mask(AT91_PIN_PA15) | -+ pin_to_mask(AT91_PIN_PA17) | -+ pin_to_mask(AT91_PIN_PA25) | -+ pin_to_mask(AT91_PIN_PA26) | -+ pin_to_mask(AT91_PIN_PA28), -+ pin_to_controller(AT91_PIN_PA0) + PIO_PUDR); -+ -+ /* Need to reset PHY -> 500ms reset */ -+ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -+ (AT91_RSTC_ERSTL & (0x0D << 8)) | -+ AT91_RSTC_URSTEN); -+ -+ at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); -+ -+ /* Wait for end hardware reset */ -+ while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL)); -+ -+ /* Restore NRST value */ -+ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -+ (AT91_RSTC_ERSTL & (0x0 << 8)) | -+ AT91_RSTC_URSTEN); -+ -+ /* Re-enable pull-up */ -+ writel(pin_to_mask(AT91_PIN_PA14) | -+ pin_to_mask(AT91_PIN_PA15) | -+ pin_to_mask(AT91_PIN_PA17) | -+ pin_to_mask(AT91_PIN_PA25) | -+ pin_to_mask(AT91_PIN_PA26) | -+ pin_to_mask(AT91_PIN_PA28), -+ pin_to_controller(AT91_PIN_PA0) + PIO_PUER); -+ -+ at91_set_A_periph(AT91_PIN_PA19, 0); /* ETXCK_EREFCK */ -+ at91_set_A_periph(AT91_PIN_PA17, 0); /* ERXDV */ -+ at91_set_A_periph(AT91_PIN_PA14, 0); /* ERX0 */ -+ at91_set_A_periph(AT91_PIN_PA15, 0); /* ERX1 */ -+ at91_set_A_periph(AT91_PIN_PA18, 0); /* ERXER */ -+ at91_set_A_periph(AT91_PIN_PA16, 0); /* ETXEN */ -+ at91_set_A_periph(AT91_PIN_PA12, 0); /* ETX0 */ -+ at91_set_A_periph(AT91_PIN_PA13, 0); /* ETX1 */ -+ at91_set_A_periph(AT91_PIN_PA21, 0); /* EMDIO */ -+ at91_set_A_periph(AT91_PIN_PA20, 0); /* EMDC */ -+ -+#ifndef CONFIG_RMII -+ at91_set_B_periph(AT91_PIN_PA28, 0); /* ECRS */ -+ at91_set_B_periph(AT91_PIN_PA29, 0); /* ECOL */ -+ at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ -+ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ -+ at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */ -+#if defined(CONFIG_AT91SAM9G20EK) -+ /* -+ * use PA10, PA11 for ETX2, ETX3. -+ * PA23 and PA24 are for TWI EEPROM -+ */ -+ at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */ -+ at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */ -+#else -+ at91_set_B_periph(AT91_PIN_PA23, 0); /* ETX2 */ -+ at91_set_B_periph(AT91_PIN_PA24, 0); /* ETX3 */ -+#endif -+ at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */ -+#endif -+ -+} -+#endif -+ -+int board_init(void) -+{ -+ /* Enable Ctrlc */ -+ console_init_f(); -+ -+ /* arch number of AT91SAM9G20EK-Board */ -+ gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK; -+ /* adress of boot parameters */ -+ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -+ -+ at91sam9g20ek_serial_hw_init(); -+#ifdef CONFIG_CMD_NAND -+ at91sam9g20ek_nand_hw_init(); -+#endif -+#ifdef CONFIG_HAS_DATAFLASH -+ at91sam9g20ek_spi_hw_init(); -+#endif -+#ifdef CONFIG_MACB -+ at91sam9g20ek_macb_hw_init(); -+#endif -+ -+ return 0; -+} -+ -+int dram_init(void) -+{ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM; -+ gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; -+ return 0; -+} -+ -+#ifdef CONFIG_RESET_PHY_R -+void reset_phy(void) -+{ -+#ifdef CONFIG_MACB -+ /* -+ * Initialize ethernet HW addr prior to starting Linux, -+ * needed for nfsroot -+ */ -+ eth_init(gd->bd); -+#endif -+} -+#endif -Index: board/atmel/at91sam9g20ek/led.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/led.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/led.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,64 @@ -+/* -+ * (C) Copyright 2007-2008 -+ * Stelian Pop <stelian.pop@leadtechdesign.com> -+ * Lead Tech Design <www.leadtechdesign.com> -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <common.h> -+#include <asm/arch/at91sam9260.h> -+#include <asm/arch/at91_pmc.h> -+#include <asm/arch/gpio.h> -+#include <asm/arch/io.h> -+ -+#define RED_LED AT91_PIN_PA9 /* this is the power led */ -+#define GREEN_LED AT91_PIN_PA6 /* this is the user led */ -+ -+void red_LED_on(void) -+{ -+ at91_set_gpio_value(RED_LED, 1); -+} -+ -+void red_LED_off(void) -+{ -+ at91_set_gpio_value(RED_LED, 0); -+} -+ -+void green_LED_on(void) -+{ -+ at91_set_gpio_value(GREEN_LED, 0); -+} -+ -+void green_LED_off(void) -+{ -+ at91_set_gpio_value(GREEN_LED, 1); -+} -+ -+void coloured_LED_init(void) -+{ -+ /* Enable clock */ -+ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOA); -+ -+ at91_set_gpio_output(RED_LED, 1); -+ at91_set_gpio_output(GREEN_LED, 1); -+ -+ at91_set_gpio_value(RED_LED, 0); -+ at91_set_gpio_value(GREEN_LED, 1); -+} -Index: board/atmel/at91sam9g20ek/partition.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/partition.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/partition.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,40 @@ -+/* -+ * (C) Copyright 2008 -+ * Ulf Samuelsson <ulf@atmel.com> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ */ -+#include <common.h> -+#include <config.h> -+#include <asm/hardware.h> -+#include <dataflash.h> -+ -+AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; -+ -+struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { -+ {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -+ {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1} -+}; -+ -+/*define the area offsets*/ -+dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { -+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, -+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, -+ {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, -+ {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, -+ {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -+}; -Index: board/atmel/at91sam9g20ek/config.mk -=================================================================== ---- a/board/atmel/at91sam9g20ek/config.mk (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/config.mk (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1 @@ -+TEXT_BASE = 0x23f00000 -Index: board/atmel/at91sam9g20ek/Makefile -=================================================================== ---- a/board/atmel/at91sam9g20ek/Makefile (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/Makefile (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,57 @@ -+# -+# (C) Copyright 2003-2008 -+# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -+# -+# (C) Copyright 2008 -+# Stelian Pop <stelian.pop@leadtechdesign.com> -+# Lead Tech Design <www.leadtechdesign.com> -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = $(obj)lib$(BOARD).a -+ -+COBJS-y += at91sam9g20ek.o -+COBJS-y += led.o -+COBJS-y += partition.o -+COBJS-$(CONFIG_CMD_NAND) += nand.o -+ -+SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) -+OBJS := $(addprefix $(obj),$(COBJS-y)) -+SOBJS := $(addprefix $(obj),$(SOBJS)) -+ -+$(LIB): $(obj).depend $(OBJS) $(SOBJS) -+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak $(obj).depend -+ -+######################################################################### -+ -+# defines $(obj).depend target -+include $(SRCTREE)/rules.mk -+ -+sinclude $(obj).depend -+ -+######################################################################### -Index: include/asm-arm/arch-at91/hardware.h -=================================================================== ---- a/include/asm-arm/arch-at91/hardware.h (.../u-boot-1.3.4) (revision 8417) -+++ b/include/asm-arm/arch-at91/hardware.h (.../u-boot-1.3.4-exp) (revision 8417) -@@ -18,7 +18,7 @@ - - #if defined(CONFIG_AT91RM9200) - #include <asm/arch/at91rm9200.h> --#elif defined(CONFIG_AT91SAM9260) -+#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) - #include <asm/arch/at91sam9260.h> - #define AT91_BASE_EMAC AT91SAM9260_BASE_EMAC - #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 -diff -urN u-boot-2008.10-0rig/include/asm-arm/mach-types.h u-boot-2008.10/include/asm-arm/mach-types.h ---- u-boot-2008.10-0rig/include/asm-arm/mach-types.h 2008-10-18 21:30:31.000000000 +0200 -+++ u-boot-2008.10/include/asm-arm/mach-types.h 2008-12-28 23:40:55.000000000 +0100 -@@ -23998,6 +23998,18 @@ - # define machine_is_geneva() (0) - #endif - -+#ifdef CONFIG_MACH_AT91SAM9G20EK -+# ifdef machine_arch_type -+# undef machine_arch_type -+# define machine_arch_type __machine_arch_type -+# else -+# define machine_arch_type MACH_TYPE_AT91SAM9G20EK -+# endif -+# define machine_is_at91sam9g20ek() (machine_arch_type == MACH_TYPE_AT91SAM9G20EK) -+#else -+# define machine_is_at91sam9g20ek() (0) -+#endif -+ - /* - * These have not yet been registered - */ -diff -urN u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c ---- u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c 2008-12-28 14:09:52.000000000 +0100 -+++ u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c 2008-12-28 23:56:09.000000000 +0100 -@@ -248,3 +248,13 @@ - #endif - } - #endif -+ -+int board_eth_init(bd_t *bis) -+{ -+ int rc = 0; -+#ifdef CONFIG_MACB -+ rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00); -+#endif -+ return rc; -+} -+ diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch deleted file mode 100644 index 81ab7c6..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch +++ /dev/null @@ -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 */ - diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch deleted file mode 100644 index 8f71ee0..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch +++ /dev/null @@ -1,576 +0,0 @@ -diff -urN u-boot-2008.10-0rig//tools/Makefile u-boot-2008.10/tools/Makefile ---- u-boot-2008.10-0rig//tools/Makefile 2008-12-31 17:51:29.000000000 +0100 -+++ u-boot-2008.10/tools/Makefile 2008-12-31 19:38:15.000000000 +0100 -@@ -37,6 +37,11 @@ - #OBJ_FILES += mpc86x_clk.o - #endif - -+ifeq ($(VENDOR),atmel) -+BINS+= raw-at91$(SFX) sx-at91$(SFX) -+OBJS+= raw-at91.o sx-at91.o -+endif -+ - LIBFDT_OBJ_FILES = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror.o $(obj)fdt_wip.o - - LOGO_H = $(OBJTREE)/include/bmp_logo.h -@@ -175,6 +180,14 @@ - $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ - $(STRIP) $@ - -+$(obj)raw-at91$(SFX): $(obj)raw-at91.o -+ $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ -+ $(STRIP) $@ -+ -+$(obj)sx-at91$(SFX): $(obj)sx-at91.o -+ $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ -+ $(STRIP) $@ -+ - $(obj)envcrc.o: $(src)envcrc.c - $(CC) -g $(CFLAGS) -c -o $@ $< - -@@ -223,6 +236,12 @@ - $(obj)fdt_wip.o: $(obj)fdt_wip.c - $(CC) -g $(FIT_CFLAGS) -c -o $@ $< - -+$(obj)sx-at91.o: $(src)sx-at91.c -+ $(CC) -g $(CFLAGS) -c -o $@ $< -+ -+$(obj)raw-at91.o: $(src)raw-at91.c -+ $(CC) -g $(CFLAGS) -c -o $@ $< -+ - subdirs: - ifeq ($(TOOLSUBDIRS),) - @: -diff -urN u-boot-2008.10-0rig//tools/raw-at91.c u-boot-2008.10/tools/raw-at91.c ---- u-boot-2008.10-0rig//tools/raw-at91.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2008.10/tools/raw-at91.c 2008-12-31 19:26:23.000000000 +0100 -@@ -0,0 +1,225 @@ -+/* -+ * xmodem-at91.c -+ * -+ * A simple program using xmodem/1kxmode upload file to at91rm9200 based board. -+ * Created by (C) Copyright 2004 -+ * Linhang.Zhang, Jilin University of PR.China, linxing at jlu.edu.cn. -+ * -+ ************************************************************************************* -+ * -+ * Modified 01-Feb-2005 (C)Copyright 2005 -+ * Marco Cavallini, www.KoanSoftware.com - ITALY, m.cavallini@koansoftware.com -+ * - edited indentations and changed break usage in switch statement. -+ * - added "\r" to printf -+ * -+ * - build with -+ * gcc sx-at91.c -o sx-at91 -+ * -+ * - Howto use this program with minicom/xminicom and AT91 -+ * start minicom or xminicom -+ * edit Options / File transfer protocol, -+ * add a name (for example J) like the following example -+ * -+ * | Name Program Name U/D FullScr IO-Red. Multi | -+ * | A zmodem /usr/bin/sz -vv -b Y U N Y Y | -+ * | B ymodem /usr/bin/sb -vv Y U N Y Y | -+ * | C xmodem /usr/bin/sx -vv Y U N Y N | -+ * | D zmodem /usr/bin/rz -vv -b -E N D N Y Y | -+ * | E ymodem /usr/bin/rb -vv N D N Y Y | -+ * | F xmodem /usr/bin/rx -vv Y D N Y N | -+ * | G kermit /usr/bin/kermit -i -l %l -s Y U Y N N | -+ * | H kermit /usr/bin/kermit -i -l %l -r N D Y N N | -+ * | I ascii /usr/bin/ascii-xfr -dsv Y U N Y N | -+ * | J at91 /home/koan/xmodem/xs-at91 Y U Y N N | -+ * | K - | -+ * | L - | -+ * -+ * save and use it selecting at91 protocol when you start an Xmodem upload to AT91 -+ * -+ ************************************************************************************* -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <termios.h> -+#include <errno.h> -+#include <time.h> -+ -+#define TRUE 1 -+#define FALSE 0 -+#define LINESIZE 1024 -+ -+/*********/ -+ -+#define SERIAL_DEVICE "/dev/ttyS0" -+#define MYBAUDRATE B115200 -+ -+/***************SUB PROGRAM*******/ -+ -+int Initial_SerialPort(void) -+{ -+ int fd; -+ struct termios options; -+ -+ fd = open( SERIAL_DEVICE , O_RDWR | O_NOCTTY | O_NDELAY ); -+ if ( fd == -1 ) -+ { -+ /*open error!*/ -+ perror("Can't open serial port!"); -+ return -1; -+ } -+ -+ /*Get the current options for the port...*/ -+ tcgetattr(fd, &options); -+ -+ /*Set the baud rates to BAUDRATE...*/ -+ cfsetispeed(&options,MYBAUDRATE); -+ cfsetospeed(&options,MYBAUDRATE); -+ tcsetattr(fd, TCSANOW, &options); -+ if (0 != tcgetattr(fd, &options)) -+ { -+ perror("SetupSerial 1"); -+ return -1; -+ } -+ -+ /* -+ * 8bit Data,no partity,1 stop bit... -+ */ -+ options.c_cflag &= ~PARENB; -+ options.c_cflag &= ~CSTOPB; -+ options.c_cflag &= ~CSIZE; -+ options.c_cflag |= CS8; -+ tcflush(fd,TCIFLUSH); -+ -+ /***Choosing Raw Input*/ -+ options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); -+ options.c_oflag &= ~OPOST; -+ -+ /* -+ * Set the new options for the port... -+ */ -+ if (0 != tcsetattr(fd, TCSANOW, &options)) -+ { -+ perror("SetupSerial error"); -+ return -1 ; -+ } -+ -+ return fd ; -+} -+ -+/******************************/ -+void ClearReceiveBuffer(int fd) -+{ -+ unsigned char tmp; -+ while ((read(fd,&tmp,1))>0); -+ -+ return; -+} -+unsigned char filebuf[ LINESIZE+2 ]; -+unsigned char outbuf[ LINESIZE+2 ]; -+FILE *datafile; -+int fd; -+ -+static unsigned int ChCnt=0; -+static unsigned int ChIx; -+unsigned char GetChar(unsigned char *ch) -+/* -+ * SUCCESS: Return TRUE -+ * FAILURE: Return FALSE -+ */ -+{ -+ -+ if(ChCnt == 0) { -+ ChCnt = fread( filebuf, sizeof(char), LINESIZE, datafile); -+ ChIx = 0; -+ } -+ if(ChCnt > 0) { -+ *ch = filebuf[ChIx++]; -+ ChCnt--; -+ return TRUE; -+ } else { -+ return FALSE; /* Reached End of File */ -+ } -+} -+ -+/********************************/ -+void delay() -+{ -+} -+ -+int main(int argc,char *argv[]) -+{ -+ char *data_file_name; -+ int len; -+ unsigned char c; -+ int complete,i,sts; -+ -+ printf("raw-at91 started...\r\n"); -+ -+ /* open serial port1 */ -+ if ( (fd = Initial_SerialPort()) == -1) -+ return -1 ; -+ -+ data_file_name = argv[1]; -+ -+ if((datafile=fopen(data_file_name,"rb"))==NULL) -+ { -+ perror ("Can't open file!"); -+ return -1 ; -+ } -+ -+ /*******************************/ -+ -+ complete = 0; -+ /* ClearReceiveBuffer(fd); */ -+ -+ /* while((read(fd,&ack_id,1))<=0);*/ -+ -+ /* printf("%c\r\n",ack_id); */ -+ while(!complete) -+ { -+ for(i=0;i < LINESIZE; i++) { /* A line more than 1024 characters will have problems...*/ -+ if((sts = GetChar(&outbuf[i]))) { -+ /* Sts = Success */ -+ if((c = outbuf[i]) == '\n') { /* Found end of Line - Start Processing*/ -+ outbuf[i+1] = '\0'; /* Terminate String*/ -+ break; -+ } -+ } else { -+ /* Sts = Failure - End of File */ -+ outbuf[i] = '\n'; -+ outbuf[i+1] = '\0'; -+ complete = 1; -+ } -+ } -+ printf("%s",outbuf); /* Inform user */ -+ len = strlen((char *)outbuf); -+ write(fd,outbuf,strlen((char *)outbuf)); -+ for(i = 0; i < 500000000; i++ ) delay(); -+ while((read(fd,&c,1))<=0) putchar(c); -+ printf(" "); -+ } -+ fclose(datafile); -+ close(fd); -+ return 0; -+} -diff -urN u-boot-2008.10-0rig//tools/sx-at91.c u-boot-2008.10/tools/sx-at91.c ---- u-boot-2008.10-0rig//tools/sx-at91.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2008.10/tools/sx-at91.c 2008-12-31 19:26:23.000000000 +0100 -@@ -0,0 +1,300 @@ -+/* -+ * xmodem-at91.c -+ * -+ * A simple program using xmodem/1kxmode upload file to at91rm9200 based board. -+ * Created by (C) Copyright 2004 -+ * Linhang.Zhang, Jilin University of PR.China, linxing at jlu.edu.cn. -+ * -+ ************************************************************************************* -+ * -+ * Modified 01-Feb-2005 (C)Copyright 2005 -+ * Marco Cavallini, www.KoanSoftware.com - ITALY, m.cavallini@koansoftware.com -+ * - edited indentations and changed break usage in switch statement. -+ * - added "\r" to printf -+ * -+ * - build with -+ * gcc sx-at91.c -o sx-at91 -+ * -+ * - Howto use this program with minicom/xminicom and AT91 -+ * start minicom or xminicom -+ * edit Options / File transfer protocol, -+ * add a name (for example J) like the following example -+ * -+ * | Name Program Name U/D FullScr IO-Red. Multi | -+ * | A zmodem /usr/bin/sz -vv -b Y U N Y Y | -+ * | B ymodem /usr/bin/sb -vv Y U N Y Y | -+ * | C xmodem /usr/bin/sx -vv Y U N Y N | -+ * | D zmodem /usr/bin/rz -vv -b -E N D N Y Y | -+ * | E ymodem /usr/bin/rb -vv N D N Y Y | -+ * | F xmodem /usr/bin/rx -vv Y D N Y N | -+ * | G kermit /usr/bin/kermit -i -l %l -s Y U Y N N | -+ * | H kermit /usr/bin/kermit -i -l %l -r N D Y N N | -+ * | I ascii /usr/bin/ascii-xfr -dsv Y U N Y N | -+ * | J at91 /home/koan/xmodem/xs-at91 Y U Y N N | -+ * | K - | -+ * | L - | -+ * -+ * save and use it selecting at91 protocol when you start an Xmodem upload to AT91 -+ * -+ ************************************************************************************* -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <termios.h> -+#include <errno.h> -+#include <time.h> -+ -+/* -+Xmodem Frame form: <SOH><blk #><255-blk #><--128 data bytes--><CRC hi><CRC lo> -+*/ -+ -+#define XMODEM_SOH 0x01 -+#define XMODEM_STX 0x02 -+#define XMODEM_EOT 0x04 -+#define XMODEM_ACK 0x06 -+#define XMODEM_NAK 0x15 -+#define XMODEM_CRC_CHR 'C' -+#define XMODEM_CRC_SIZE 2 /* Crc_High Byte + Crc_Low Byte */ -+#define XMODEM_FRAME_ID_SIZE 2 /* Frame_Id + 255-Frame_Id */ -+#define XMODEM_DATA_SIZE_SOH 128 /* for Xmodem protocol */ -+#define XMODEM_DATA_SIZE_STX 1024 /* for 1K xmodem protocol */ -+#define USE_1K_XMODEM 0 /* 1 for use 1k_xmodem 0 for xmodem */ -+ -+#if (USE_1K_XMODEM) -+ #define XMODEM_DATA_SIZE XMODEM_DATA_SIZE_STX -+ #define XMODEM_HEAD XMODEM_STX -+#else -+ #define XMODEM_DATA_SIZE XMODEM_DATA_SIZE_SOH -+ #define XMODEM_HEAD XMODEM_SOH -+#endif -+/*********/ -+ -+#define SERIAL_DEVICE "/dev/ttyS0" -+#define MYBAUDRATE B115200 -+ -+/***************SUB PROGRAM*******/ -+unsigned short GetCrc16 ( char *ptr, unsigned short count ) -+{ -+ unsigned short crc, i; -+ -+ crc = 0; -+ while(count--) -+ { -+ crc = crc ^ (int) *ptr++ << 8; -+ -+ for(i = 0; i < 8; i++) -+ { -+ if(crc & 0x8000) -+ crc = crc << 1 ^ 0x1021; -+ else -+ crc = crc << 1; -+ } -+ } -+ -+ return (crc & 0xFFFF); -+} -+ -+/*******************************/ -+int Initial_SerialPort(void) -+{ -+ int fd; -+ struct termios options; -+ -+ fd = open( SERIAL_DEVICE , O_RDWR | O_NOCTTY | O_NDELAY ); -+ if ( fd == -1 ) -+ { -+ /*open error!*/ -+ perror("Can't open serial port!"); -+ return -1; -+ } -+ -+ /*Get the current options for the port...*/ -+ tcgetattr(fd, &options); -+ -+ /*Set the baud rates to BAUDRATE...*/ -+ cfsetispeed(&options,MYBAUDRATE); -+ cfsetospeed(&options,MYBAUDRATE); -+ tcsetattr(fd, TCSANOW, &options); -+ if (0 != tcgetattr(fd, &options)) -+ { -+ perror("SetupSerial 1"); -+ return -1; -+ } -+ -+ /* -+ * 8bit Data,no partity,1 stop bit... -+ */ -+ options.c_cflag &= ~PARENB; -+ options.c_cflag &= ~CSTOPB; -+ options.c_cflag &= ~CSIZE; -+ options.c_cflag |= CS8; -+ tcflush(fd,TCIFLUSH); -+ -+ /***Choosing Raw Input*/ -+ options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); -+ options.c_oflag &= ~OPOST; -+ -+ /* -+ * Set the new options for the port... -+ */ -+ if (0 != tcsetattr(fd, TCSANOW, &options)) -+ { -+ perror("SetupSerial error"); -+ return -1 ; -+ } -+ -+ return fd ; -+} -+ -+/******************************/ -+void ClearReceiveBuffer(int fd) -+{ -+ unsigned char tmp; -+ while ((read(fd,&tmp,1))>0); -+ -+ return; -+} -+ -+/********************************/ -+int main(int argc,char *argv[]) -+{ -+ int fd; -+ char *data_file_name; -+ char packet_data[ XMODEM_DATA_SIZE ]; -+ char frame_data[ XMODEM_DATA_SIZE + XMODEM_CRC_SIZE + XMODEM_FRAME_ID_SIZE + 1 ]; -+ FILE *datafile; -+ int complete,retry_num,pack_counter,read_number,write_number,i; -+ unsigned short crc_value; -+ unsigned char ack_id; -+ -+ printf("sx-at91 started...\r\n"); -+ -+ /* open serial port1 */ -+ if ( (fd = Initial_SerialPort()) == -1) -+ return -1 ; -+ -+ data_file_name = argv[1]; -+ -+ if((datafile=fopen(data_file_name,"rb"))==NULL) -+ { -+ perror ("Can't open file!"); -+ return -1 ; -+ } -+ -+ /*******************************/ -+ -+ pack_counter = 0; -+ complete = 0; -+ retry_num = 0; -+ ClearReceiveBuffer(fd); -+ -+ while((read(fd,&ack_id,1))<=0); -+ -+ printf("%c\r\n",ack_id); -+ ack_id=XMODEM_ACK; -+ while(!complete) -+ { -+ switch(ack_id) -+ { -+ case XMODEM_ACK: -+ retry_num = 0; -+ pack_counter++; -+ read_number = fread( packet_data, sizeof(char), XMODEM_DATA_SIZE, datafile); -+ if(read_number>0) -+ { -+ if(read_number<XMODEM_DATA_SIZE_SOH) -+ { -+ -+ printf("Start filling the last frame!\r\n"); -+ for(;read_number<XMODEM_DATA_SIZE;read_number++) -+ packet_data[read_number] = 0x00; -+ } -+ frame_data[0] = XMODEM_HEAD; -+ frame_data[1] = (char)pack_counter; -+ frame_data[2] = (char)(255-frame_data[1]); -+ -+ for(i=0;i<XMODEM_DATA_SIZE;i++) -+ frame_data[i+3]=packet_data[i]; -+ -+ crc_value = GetCrc16(packet_data,XMODEM_DATA_SIZE); -+ frame_data[XMODEM_DATA_SIZE_SOH+3]=(unsigned char)(crc_value >> 8); -+ frame_data[XMODEM_DATA_SIZE_SOH+4]=(unsigned char)(crc_value); -+ write_number = write( fd, frame_data, XMODEM_DATA_SIZE_SOH + 5); -+ printf("waiting for ACK,%d,%d,...",pack_counter,write_number); -+ while((read(fd,&ack_id,1))<=0); -+ -+ if(ack_id == XMODEM_ACK) -+ printf("Ok!\r\n"); -+ else -+ printf("Error!\r\n"); -+ } -+ else -+ { -+ ack_id = XMODEM_EOT; -+ complete = 1; -+ printf("Waiting for complete ACK ..."); -+ -+ while(ack_id != XMODEM_ACK) -+ { -+ ack_id = XMODEM_EOT; -+ write_number=write(fd,&ack_id,1); -+ while((read(fd,&ack_id,1))<=0); -+ } -+ printf("OK\r\n"); -+ -+ printf("Sending file complete\r\n"); -+ } -+ break; -+ -+ case XMODEM_NAK: -+ if( retry_num++ > 10) -+ { -+ printf("Retry too many times,Quit!\r\n"); -+ complete = 1; -+ } -+ else -+ { -+ write_number = write(fd,frame_data,XMODEM_DATA_SIZE + 5); -+ printf("Retry for ACK,%d,%d...",pack_counter,write_number); -+ while((read(fd,&ack_id,1))<=0); -+ -+ if( ack_id == XMODEM_ACK ) -+ printf("OK\r\n"); -+ else -+ printf("Error!\r\n"); -+ } -+ break; -+ -+ default: -+ printf("Fatal Error!\r\n"); -+ complete = 1; -+ break; -+ } -+ -+ } -+ -+ fclose(datafile); -+ close(fd); -+ -+ return 0; -+} diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch deleted file mode 100644 index 176eed5..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -urN u-boot-2008.10-0rig//Makefile u-boot-2008.10/Makefile ---- u-boot-2008.10-0rig//Makefile 2008-12-31 18:11:18.000000000 +0100 -+++ u-boot-2008.10/Makefile 2008-12-31 18:39:58.000000000 +0100 -@@ -20,6 +20,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, - # MA 02111-1307 USA - # -+BUILD_DATE= $(shell date +%F) - - VERSION = 2008 - PATCHLEVEL = 10 -@@ -294,6 +295,22 @@ - ALL += $(obj)u-boot.ldr - endif - -+ifneq ($(BOARDNAME),) -+BINARY := $(BOARDNAME)-u-boot-$(U_BOOT_VERSION)-$(BUILD_DATE) -+BINARY_BIN := $(obj)$(BINARY).bin -+BINARY_GZ := $(obj)$(BINARY).gz -+ALL += $(BINARY_BIN) -+ALL += $(BINARY_GZ) -+else -+BINARY := u-boot -+BINARY_BIN := $(obj)$(BINARY).bin -+BINARY_GZ := $(obj)$(BINARY).gz -+endif -+ -+ifeq ($(DESTDIR),) -+DESTDIR=binaries -+endif -+ - all: $(ALL) - - $(obj)u-boot.hex: $(obj)u-boot -@@ -302,9 +319,20 @@ - $(obj)u-boot.srec: $(obj)u-boot - $(OBJCOPY) -O srec $< $@ - --$(obj)u-boot.bin: $(obj)u-boot -+$(BINARY_BIN): $(obj)u-boot - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ - -+$(BINARY_GZ): $(BINARY_BIN) -+ gzip -c $(BINARY_BIN) > $(BINARY_GZ) -+ -+install: all -+ -install -d $(DESTDIR) -+ install $(BINARY_BIN) $(DESTDIR) -+ -+tftp: install -+ cp $(BINARY_GZ) $(TFTPBOOT)/$(BINARY).gz -+ cp $(BINARY_BIN) $(TFTPBOOT)/$(BINARY).bin -+ - $(obj)u-boot.ldr: $(obj)u-boot - $(LDR) -T $(CONFIG_BFIN_CPU) -f -c $@ $< $(LDR_FLAGS) - -@@ -3295,6 +3324,7 @@ - -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \ - -print0 \ - | xargs -0 rm -f -+ @rm -f $(obj)u-boot-*.gz - @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \ - $(obj)cscope.* $(obj)*.*~ - @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch deleted file mode 100644 index 7d1c958..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch +++ /dev/null @@ -1,323 +0,0 @@ -diff -urN u-boot-2009.01-0rig//common/cmd_factory.c u-boot-2009.01/common/cmd_factory.c ---- u-boot-2009.01-0rig//common/cmd_factory.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/common/cmd_factory.c 2009-01-02 19:32:07.000000000 +0100 -@@ -0,0 +1,308 @@ -+/* -+ * (C) Copyright 2000 -+ * Ulf Samuelsson <ulf.samuelsson@atmelcom>. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+/* -+ * Boot support -+ */ -+#include <config.h> -+#include <common.h> -+#include <command.h> -+#include <dataflash.h> -+ -+/* -+ * -+ * The typical use of this file, is to update config.h -+ * from an external build system -+ * -+ */ -+ -+ -+/* -+ * Macros to transform values -+ * into environment strings. -+ */ -+#define XMK_STR(x) #x -+#define MK_STR(x) XMK_STR(x) -+ -+void setargs(void); -+ -+int do_factory_defaults (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+#if defined(CONFIG_ETHADDR) -+ setenv("ethaddr", MK_STR(CONFIG_ETHADDR)); -+#endif -+#if defined(CONFIG_ETH1ADDR) -+ setenv("eth1addr", MK_STR(CONFIG_ETH1ADDR)); -+#endif -+#if defined(CONFIG_HOSTNAME) -+ setenv("hostname", MK_STR(CONFIG_HOSTNAME)); -+#endif -+#if defined(CONFIG_IPADDR) -+ setenv("ipaddr", MK_STR(CONFIG_IPADDR)); -+#endif -+#if defined(CONFIG_SERVERIP) -+ setenv("serverip", MK_STR(CONFIG_SERVERIP)); -+#endif -+#if defined(CONFIG_GATEWAY) -+ setenv("gatewayip", MK_STR(CONFIG_GATEWAY)); -+#endif -+#if defined(CONFIG_NETMASK) -+ setenv("netmask", MK_STR(CONFIG_NETMASK)); -+#endif -+#if defined(KERNEL_START) -+ setenv("kernel", MK_STR(KERNEL_START)); -+#endif -+#if defined(KERNEL_LOCATION) -+ setenv("OS", MK_STR(KERNEL_LOCATION)); -+#endif -+#if defined(FILESYSTEM_START) -+ setenv("ramdisk", MK_STR(FILESYSTEM_START)); -+ setenv("initrd", MK_STR(FILESYSTEM_START)","MK_STR(FILESYSTEM_SIZE)); -+#endif -+#if defined(FILESYSTEM_LOCATION) -+ setenv("FS", MK_STR(FS_LOCATION)); -+#endif -+#if defined(END_OF_FLASH) -+ setenv("endflash", MK_STR(END_OF_FLASH)); -+#endif -+#if defined(CONFIG_LOAD_SCRIPTS) -+ /* By updating the "fs-date" environment variable and running "fs" -+ You set "rd-1" and "rd-2" -+ */ -+ setenv("rd-1", "rootfs.arm-"MK_STR(DATE)".ext2"); -+ setenv("rd-2", "rootfs.arm-"MK_STR(DATE)".jffs2"); -+ setenv("rd-3", "rootfs.arm-linux.ext2"); -+ setenv("rd-4", "rootfs.arm-linux.jffs2"); -+ setenv("ver", "1"); -+ -+ setenv("config", "tftp ${ramdisk} autoscript.${hostname} ; autoscr ${ramdisk} "); -+ -+#if defined(KERNEL_VERSION) -+ setenv("kernel-version",MK_STR(KERNEL_VERSION)); -+#endif -+#if defined(DATE) -+ setenv("kernel-date", MK_STR(DATE)); -+ setenv("fs-date", MK_STR(DATE)); -+ setenv("rd", "rootfs.arm-"MK_STR(DATE)".ext2"); -+#endif -+#if defined(KERNEL_VERSION) -+ setenv("linux", MK_STR(BOARD_NAME)"-linux-"MK_STR(KERNEL_VERSION)"-"MK_STR(DATE)".gz"); -+#endif -+ setenv("get-ramdisk", "tftp ${ramdisk} ${rd}; setenv rd-size ${filesize}"); -+ setenv("store-ramdisk", "cp.b ${ramdisk} ${FS} ${rd-size}"); -+ setenv("load-ramdisk", "cp.b ${FS} ${ramdisk} ${rd-size}"); -+ setenv("flash-ramdisk", "run get-ramdisk; run store-ramdisk"); -+ -+ setenv("get-kernel", "tftp ${kernel} ${linux}; setenv kernel-size ${filesize}"); -+ setenv("store-kernel", "cp.b ${kernel} ${OS} ${kernel-size}; saveenv"); -+ setenv("load-kernel", "cp.b ${OS} ${kernel} ${kernel-size}; saveenv"); -+ setenv("flash-kernel", "run get-kernel; run store-kernel"); -+ -+ setenv("get", "run get-kernel ; run get-ramdisk"); -+ setenv("flash", "run flash-kernel ; run flash-ramdisk ; saveenv"); -+ setenv("load", "run load-kernel ; run load-ramdisk"); -+ -+ setenv("bootcmd", "run load ; bootm "MK_STR(KERNEL_START)); -+ -+ setenv("fstype", "ram"); -+ setenv("flashfs", "/dev/mtdblock2"); -+ setenv("ramfs", "/dev/ram"); -+ -+ setenv("rootfstype", "jffs2"); -+ setenv("access", "rw"); -+ setenv("ramdisk_size", "15360"); -+ setenv("console", "ttyS0,115200"); -+ -+ -+#if defined(MEMORY_SIZE) -+ setenv("mem", MK_STR(MEMORY_SIZE)); -+#else -+ setenv("mem", "32M"); /* Cautious default */ -+#endif -+ -+ setenv("update", "os; fs; setargs"); -+ setenv("cmpk", "run flash-kernel; cp.b ${OS} ${ramdisk} ${kernel-size}; cmp ${kernel} ${ramdisk} ${kernel-size}"); -+#endif /* CONFIG_LOAD_SCRIPTS */ -+#if defined(CONFIG_AT91RM9200) -+ setenv("machid24", "0x0fb"); -+ setenv("machid26", "0x2c1"); -+ setenv("machid", "0x2c1"); -+ setenv("k24", "setenv machid ${machid24}; os"); -+ setenv("k26", "setenv machid ${machid26}; os"); -+#endif -+ AT91F_DataflashSetEnv (); -+#if defined(CONFIG_LOAD_SCRIPTS) -+ setargs(); -+#endif -+ return (saveenv() ? 1 : 0); -+} -+ -+ -+ -+U_BOOT_CMD( -+ factory, 1, 1, do_factory_defaults, -+ "factory\t- Create a default environment\n", -+ "\n" -+); -+ -+#if defined(CONFIG_LOAD_SCRIPTS) -+void setargs(void) -+{ -+ char cmd[512]; -+ char fstype[512]; -+ -+ sprintf(fstype,getenv("fstype")); -+ if((fstype[0] != 'f') && (fstype[0] != 'r')) { -+ fstype[0] = 'r'; -+ } -+ -+ if(fstype[0] == 'f') { -+ sprintf(cmd,"root=%s rootfstype=%s ip=%s:%s:%s:%s console=%s,mem=%s", -+ getenv("flashfs"), -+ getenv("rootfstype"), -+ getenv("ipaddr"), -+ getenv("serverip"), -+ getenv("gatewayip"), -+ getenv("netmask"), -+ getenv("console"), -+ getenv("mem") -+ ); -+ cmd[511] = '\0'; -+ printf("len=%d: %s\n",strlen(cmd),cmd); -+ if(strlen(cmd) > 500) { -+ printf("Error: Environment too large during 'setargs'\n"); -+ } else { -+ setenv("bootargs",cmd); -+ setenv("bootcmd", "run load-kernel ; bootm 21000000"); -+ } -+ } else if(fstype[0] == 'r') { -+ sprintf(cmd,"root=%s %s initrd=%s ramdisk_size=%s ip=%s:%s:%s:%s console=%s,mem=%s", -+ getenv("ramfs"), -+ getenv("access"), -+ getenv("initrd"), -+ getenv("ramdisk_size"), -+ getenv("ipaddr"), -+ getenv("serverip"), -+ getenv("gatewayip"), -+ getenv("netmask"), -+ getenv("console"), -+ getenv("mem") -+ ); -+ printf("len=%d: %s\n",strlen(cmd),cmd); -+ cmd[511] = '\0'; -+ if(strlen(cmd) > 500) { -+ printf("Error: Environment too large during 'setargs'\n"); -+ } else { -+ setenv("bootargs",cmd); -+ setenv("bootcmd", "run load ; bootm 21000000"); -+ } -+ } else { -+ setenv("bootargs","no args"); -+ } -+} -+ -+int do_setargs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ setargs(); -+ return 0; -+} -+ -+U_BOOT_CMD( -+ setargs, 1, 1, do_setargs, -+ "setargs\t- Create a bootargs from:" -+ "fstype=flash: (${flash} ${access} ${initrd} ${ramdisk_size}) " -+ "fstype=ram: (${ram} ${access} ${initrd} ${ramdisk_size}) " -+ "${ipaddr} ${serverip} ${gatewayip} ${netmask} " -+ "${console} ${mem}\n" -+ , "\n" -+); -+ -+int do_os (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ char *kchip; -+ char *kdate; -+ char *kver; -+ char cmd[512]; -+ kchip = getenv("hostname"); -+ kdate = getenv("kernel-date"); -+ kver = getenv("kernel-version"); -+ if((strlen(kdate) + strlen(kver) + 32) > 500) { -+ printf("Error: Environment too large during 'os': "); -+ printf("len=%d\n", strlen(kdate) + strlen(kver) + 32); -+ } else if(kver != NULL) { -+ if(kdate != NULL) { -+ sprintf(cmd,"%s-linux-%s-%s.gz",kchip,kver,kdate); -+ } else { -+ sprintf(cmd,"%s-linux-%s.gz",kchip,kver); -+ } -+ printf("Setting kernel to %s\n",cmd); -+ setenv("linux",cmd); -+ return 0; -+ } -+ return 1; -+} -+ -+U_BOOT_CMD( -+ os, 1, 1, do_os, -+ "os\t- Select linux version ${hostname}-linux-${kernel-name}-${kernel-date}\n" -+ , "\n" -+); -+ -+ -+int do_fs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ char *ver; -+ char *fsdate; -+ char *hostname; -+ char cmd[512]; -+ fsdate = getenv("fs-date"); -+ hostname = getenv("hostname"); -+ -+ if(fsdate != NULL) { -+ sprintf(cmd,"rootfs.arm-%s.ext2",fsdate); -+ setenv("rd-1",cmd); -+ sprintf(cmd,"rootfs.arm-%s.jffs2",fsdate); -+ setenv("rd-2",cmd); -+ } -+ ver = getenv("ver"); /* Find out which version we are using*/ -+ if(cmd==NULL) { -+ setenv("ver","1"); -+ } -+ ver = getenv("ver"); /* Find out which version we are using*/ -+ sprintf(cmd,"rd-%s",ver); /* create rd${ver}*/ -+ ver=getenv(cmd); -+ sprintf(cmd,"%s",ver); -+ printf("Setting ramdisk to %s\n",cmd); -+ setenv("rd",cmd); -+ return 0; -+} -+ -+ -+U_BOOT_CMD( -+ fs, 1, 1, do_fs, -+ "fs\t- Select ramdisk version == rd-${ver}\n" -+ , "\n" -+); -+#endif /* #if defined(CONFIG_LOAD_SCRIPTS) */ -+ -+ -diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile ---- u-boot-2009.01-0rig//common/Makefile 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/common/Makefile 2009-01-02 19:17:16.000000000 +0100 -@@ -84,6 +84,7 @@ - COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o - COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o - COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o -+COBJS-$(CONFIG_CMD_FACTORY) += cmd_factory.o - COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o - COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o - COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch deleted file mode 100644 index 5c1d29d..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -urN u-boot-2009.01-0rig//common/cmd_led.c u-boot-2009.01/common/cmd_led.c ---- u-boot-2009.01-0rig//common/cmd_led.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/common/cmd_led.c 2009-01-03 23:39:57.000000000 +0100 -@@ -0,0 +1,84 @@ -+/* -+ * (C) Copyright 2008 -+ * Ulf Samuelsson <ulf.samuelsson@atmel.com> -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+/* -+ * This file provides a shell like 'test' function to return -+ * true/false from an integer or string compare of two memory -+ * locations or a location and a scalar/literal. -+ * A few parts were lifted from bash 'test' command -+ */ -+ -+#include <common.h> -+#include <config.h> -+#include <command.h> -+#include <coloured_led.h> -+ -+int do_led ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ) -+{ -+ int led; -+ /* Validate arguments */ -+ if ((argc != 3)){ -+ printf("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ if (strcmp(argv[1], "1") == 0) { -+ led = (1 << 0); -+ } else if (strcmp(argv[1], "2") == 0) { -+ led = (1 << 1); -+ } else if (strcmp(argv[1], "3") == 0) { -+ led = (1 << 2); -+ } else if (strcmp(argv[1], "green") == 0) { -+ led = (1 << 0); -+ } else if (strcmp(argv[1], "yellow") == 0) { -+ led = (1 << 1); -+ } else if (strcmp(argv[1], "red") == 0) { -+ led = (1 << 2); -+ } else if (strcmp(argv[1], "all") == 0) { -+ led = 7; -+ } else { -+ printf ("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ -+ if (strcmp(argv[2], "off") == 0) { -+ if(led & 1) green_LED_off(); -+ if(led & 2) yellow_LED_off(); -+ if(led & 4) red_LED_off(); -+ } else if (strcmp(argv[2], "on") == 0) { -+ if(led & 1) green_LED_on(); -+ if(led & 2) yellow_LED_on(); -+ if(led & 4) red_LED_on(); -+ } else { -+ printf ("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ -+ return 0; -+} -+ -+U_BOOT_CMD( -+ led, 3, 1, do_led, -+ "led\t- [1|2|3|green|yellow|red|all] [on|off]\n", -+ "led [1|2|3|green|yellow|red|all] [on|off] sets /clears led 1,2,3\n" -+); -+ -diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile ---- u-boot-2009.01-0rig//common/Makefile 2009-01-02 21:18:24.000000000 +0100 -+++ u-boot-2009.01/common/Makefile 2009-01-03 23:41:53.000000000 +0100 -@@ -99,6 +99,7 @@ - COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o - COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o - COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -+COBJS-$(CONFIG_CMD_LED) += cmd_led.o - COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o - COBJS-y += cmd_load.o - COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o -diff -urN u-boot-2009.01-0rig//include/coloured_led.h u-boot-2009.01/include/coloured_led.h ---- u-boot-2009.01-0rig//include/coloured_led.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/include/coloured_led.h 2009-01-03 23:39:19.000000000 +0100 -@@ -0,0 +1,62 @@ -+/* -+ * (C) Copyright 2008 -+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+/* -+ * The purpose of this code is to signal the operational status of a -+ * target which usually boots over the network; while running in -+ * PCBoot, a status LED is blinking. As soon as a valid BOOTP reply -+ * message has been received, the LED is turned off. The Linux -+ * kernel, once it is running, will start blinking the LED again, -+ * with another frequency. -+ */ -+ -+#ifndef _COLOURED_LED_H_ -+#define _COLOURED_LED_H_ -+ -+#ifdef CONFIG_COLOURED_LED -+ -+/* -+ * Coloured LEDs API -+ */ -+#ifndef __ASSEMBLY__ -+extern void coloured_LED_init (void); -+extern void red_LED_on(void); -+extern void red_LED_off(void); -+extern void green_LED_on(void); -+extern void green_LED_off(void); -+extern void yellow_LED_on(void); -+extern void yellow_LED_off(void); -+#else -+ .extern LED_init -+ .extern red_LED_on -+ .extern red_LED_off -+ .extern yellow_LED_on -+ .extern yellow_LED_off -+ .extern green_LED_on -+ .extern green_LED_off -+#endif -+ -+#endif /* CONFIG_COLOURED_LED */ -+ -+#endif /* _STATUS_COLOURED_H_ */ -+ -diff -urN u-boot-2009.01-0rig//include/status_led.h u-boot-2009.01/include/status_led.h ---- u-boot-2009.01-0rig//include/status_led.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/status_led.h 2009-01-03 23:44:40.000000000 +0100 -@@ -383,27 +383,6 @@ - # include <asm/status_led.h> - #endif - --/* -- * Coloured LEDs API -- */ --#ifndef __ASSEMBLY__ --extern void coloured_LED_init (void); --extern void red_LED_on(void); --extern void red_LED_off(void); --extern void green_LED_on(void); --extern void green_LED_off(void); --extern void yellow_LED_on(void); --extern void yellow_LED_off(void); --#else -- .extern LED_init -- .extern red_LED_on -- .extern red_LED_off -- .extern yellow_LED_on -- .extern yellow_LED_off -- .extern green_LED_on -- .extern green_LED_off --#endif -- - #endif /* CONFIG_STATUS_LED */ - - #endif /* _STATUS_LED_H_ */ diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch deleted file mode 100644 index 8ab469f..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -urN u-boot-2009.01-0rig//common/cmd_mux.c u-boot-2009.01/common/cmd_mux.c ---- u-boot-2009.01-0rig//common/cmd_mux.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/common/cmd_mux.c 2009-01-04 00:17:19.000000000 +0100 -@@ -0,0 +1,78 @@ -+/* -+ * (C) Copyright 2008 -+ * Ulf Samuelsson <ulf.samuelsson@atmel.com> -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include <common.h> -+#include <command.h> -+#if (defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)) -+ -+#include <asm/arch/AT91RM9200.h> -+#include <dataflash.h> -+#include <at45.h> -+ -+ -+static int mmc_nspi (const char *s) -+{ -+ if (strcmp(s, "mmc") == 0) { -+ return (1); -+ } else if (strcmp(s, "spi") == 0) { -+ return (0); -+ } -+ return (-1); -+} -+ -+int do_mux ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ switch (argc) { -+ case 2: /* on / off */ -+ switch (mmc_nspi(argv[1])) { -+#if 0 /* prevented by varargs handling; FALLTROUGH is harmless, too */ -+ default: printf ("Usage:\n%s\n", cmdtp->usage); -+ return; -+#endif -+ case 0: AT91F_SelectSPI (); -+ break; -+ case 1: AT91F_SelectMMC (); -+ break; -+ } -+ /* FALL TROUGH */ -+ case 1: /* get status */ -+ printf ("Mux is configured to be %s\n", -+ AT91F_GetMuxStatus() ? "MMC" : "SPI"); -+ return 0; -+ default: -+ printf ("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ return 0; -+} -+ -+ -+U_BOOT_CMD( -+ mux, 2, 1, do_mux, -+ "mux\t- enable or disable MMC or SPI\n", -+ "[mmc, spi]\n" -+ " - enable or disable MMC or SPI\n" -+); -+ -+#endif /* CONFIG_CMD_MUX */ -+ -diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile ---- u-boot-2009.01-0rig//common/Makefile 2009-01-04 00:10:28.000000000 +0100 -+++ u-boot-2009.01/common/Makefile 2009-01-04 00:20:39.000000000 +0100 -@@ -112,6 +112,7 @@ - COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o - COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o - COBJS-$(CONFIG_MP) += cmd_mp.o -+COBJS-$(CONFIG_CMD_AT91_SPIMUX) += cmd_mux.o - COBJS-y += cmd_nand.o - COBJS-$(CONFIG_CMD_NET) += cmd_net.o - COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch deleted file mode 100644 index c2f709c..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -urN u-boot-2009.01-0rig//common/cmd_ethinit.c u-boot-2009.01/common/cmd_ethinit.c ---- u-boot-2009.01-0rig//common/cmd_ethinit.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2009.01/common/cmd_ethinit.c 2009-01-04 00:28:39.000000000 +0100 -@@ -0,0 +1,62 @@ -+/* -+ * (C) Copyright 2000 -+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+/* -+ * Boot support -+ */ -+#include <common.h> -+#include <command.h> -+#include <net.h> -+#ifdef CONFIG_CMD_ETHINIT -+extern int eth_init (bd_t * bd); -+ -+static void delay(void) -+{ -+} -+/* -+ * This command allows you to delay booting until you have a -+ * valid Ethernet connection. -+ * Neccessary if you want to NFS mount a rootfs etc. -+ * When both this target and the NFS server -+ * are powered on at the same time, then the NFS -+ * server can take a long time to boot. -+ */ -+int do_ethinit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ int i; -+ DECLARE_GLOBAL_DATA_PTR; -+ while(eth_init (gd->bd) == 0) { -+ for(i = 0; i < 10000000; i ++) { -+ delay(); -+ } -+ } -+ return 0; -+} -+ -+U_BOOT_CMD( -+ ethinit, 1, 1, do_ethinit, -+ "ethinit\t- Initialize Ethernet controller\n", -+ "\n" -+); -+ -+#endif /* CONFIG_CMD_ETHINIT */ -diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile ---- u-boot-2009.01-0rig//common/Makefile 2009-01-04 00:22:06.000000000 +0100 -+++ u-boot-2009.01/common/Makefile 2009-01-04 00:29:46.000000000 +0100 -@@ -83,6 +83,7 @@ - COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o - COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o - COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o -+COBJS-$(CONFIG_CMD_ETHINIT) += cmd_ethinit.o - COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o - COBJS-$(CONFIG_CMD_FACTORY) += cmd_factory.o - COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch deleted file mode 100644 index e65645b..0000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -urN u-boot-2009.01-0rig//include/configs/at91cap9adk.h u-boot-2009.01/include/configs/at91cap9adk.h ---- u-boot-2009.01-0rig//include/configs/at91cap9adk.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91cap9adk.h 2009-01-04 00:43:58.000000000 +0100 -@@ -69,7 +69,9 @@ - #define CONFIG_ATMEL_LCD 1 - #define CONFIG_ATMEL_LCD_BGR555 1 - #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 -- -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - #define CONFIG_BOOTDELAY 3 - - /* -diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200df.h u-boot-2009.01/include/configs/at91rm9200df.h ---- u-boot-2009.01-0rig//include/configs/at91rm9200df.h 2009-01-02 17:37:43.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200df.h 2009-01-04 00:43:33.000000000 +0100 -@@ -123,6 +123,9 @@ - #define CONFIG_CMD_DHCP - #define CONFIG_CMD_MII - #define CONFIG_CMD_NAND -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - #define CONFIG_CMD_AT91_SPIMUX - #define CONFIG_CMD_ETHINIT - -diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200dk_df.h u-boot-2009.01/include/configs/at91rm9200dk_df.h ---- u-boot-2009.01-0rig//include/configs/at91rm9200dk_df.h 2009-01-02 10:03:11.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200dk_df.h 2009-01-04 00:42:52.000000000 +0100 -@@ -122,7 +122,11 @@ - #define CONFIG_CMD_DHCP - #define CONFIG_CMD_MII - #define CONFIG_CMD_NAND -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - #define CONFIG_CMD_AT91_SPIMUX -+#define CONFIG_CMD_ETHINIT - - #define CONFIG_NAND_LEGACY - -diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200dk.h u-boot-2009.01/include/configs/at91rm9200dk.h ---- u-boot-2009.01-0rig//include/configs/at91rm9200dk.h 2009-01-02 10:03:11.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200dk.h 2009-01-04 00:43:15.000000000 +0100 -@@ -120,7 +120,11 @@ - #define CONFIG_CMD_DHCP - #define CONFIG_CMD_MII - #define CONFIG_CMD_NAND -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - #define CONFIG_CMD_AT91_SPIMUX -+#define CONFIG_CMD_ETHINIT - - #define CONFIG_NAND_LEGACY - -diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200ek.h u-boot-2009.01/include/configs/at91rm9200ek.h ---- u-boot-2009.01-0rig//include/configs/at91rm9200ek.h 2009-01-02 17:37:43.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91rm9200ek.h 2009-01-04 00:42:35.000000000 +0100 -@@ -121,9 +121,11 @@ - #define CONFIG_CMD_DHCP - #define CONFIG_CMD_MII - #define CONFIG_CMD_NAND -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - #define CONFIG_CMD_AT91_SPIMUX - #define CONFIG_CMD_ETHINIT -- - #define CONFIG_NAND_LEGACY - - #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -diff -urN u-boot-2009.01-0rig//include/configs/at91sam9260ek.h u-boot-2009.01/include/configs/at91sam9260ek.h ---- u-boot-2009.01-0rig//include/configs/at91sam9260ek.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91sam9260ek.h 2009-01-04 00:41:56.000000000 +0100 -@@ -74,10 +74,13 @@ - #include <config_cmd_default.h> - #undef CONFIG_CMD_BDI - #undef CONFIG_CMD_IMI --#undef CONFIG_CMD_AUTOSCRIPT -+#define CONFIG_CMD_AUTOSCRIPT - #undef CONFIG_CMD_FPGA - #undef CONFIG_CMD_LOADS - #undef CONFIG_CMD_IMLS -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - - #define CONFIG_CMD_PING 1 - #define CONFIG_CMD_DHCP 1 -diff -urN u-boot-2009.01-0rig//include/configs/at91sam9261ek.h u-boot-2009.01/include/configs/at91sam9261ek.h ---- u-boot-2009.01-0rig//include/configs/at91sam9261ek.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91sam9261ek.h 2009-01-04 00:44:11.000000000 +0100 -@@ -68,6 +68,9 @@ - #define CONFIG_ATMEL_LCD 1 - #define CONFIG_ATMEL_LCD_BGR555 1 - #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - - #define CONFIG_BOOTDELAY 3 - -diff -urN u-boot-2009.01-0rig//include/configs/at91sam9263ek.h u-boot-2009.01/include/configs/at91sam9263ek.h ---- u-boot-2009.01-0rig//include/configs/at91sam9263ek.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91sam9263ek.h 2009-01-04 00:44:34.000000000 +0100 -@@ -69,6 +69,9 @@ - #define CONFIG_ATMEL_LCD 1 - #define CONFIG_ATMEL_LCD_BGR555 1 - #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - - #define CONFIG_BOOTDELAY 3 - -diff -urN u-boot-2009.01-0rig//include/configs/at91sam9rlek.h u-boot-2009.01/include/configs/at91sam9rlek.h ---- u-boot-2009.01-0rig//include/configs/at91sam9rlek.h 2008-12-16 23:48:27.000000000 +0100 -+++ u-boot-2009.01/include/configs/at91sam9rlek.h 2009-01-04 00:44:54.000000000 +0100 -@@ -68,6 +68,9 @@ - #define CONFIG_ATMEL_LCD 1 - #define CONFIG_ATMEL_LCD_RGB565 1 - #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 -+#define CONFIG_CMD_FACTORY -+#define CONFIG_CMD_LED -+#define CONFIG_COLOURED_LED - - #define CONFIG_BOOTDELAY 3 - diff --git a/target/device/Atmel/arch-arm/u-boot/Config.in b/target/device/Atmel/arch-arm/u-boot/Config.in deleted file mode 100644 index 6d32e78..0000000 --- a/target/device/Atmel/arch-arm/u-boot/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -choice - prompt "Add AT91 specific patches to u-Boot" - default BR2_TARGET_U_BOOT_2009_01_ARCH_AT91 - help - Select a patch to add to U-Boot - -config BR2_TARGET_U_BOOT_2009_01_ARCH_AT91 - bool "AT91 patches for u-boot-2009.01" - depends on BR2_TARGET_ATMEL && BR2_arm - depends on BR2_TARGET_UBOOT_2009_01 - help - Apply the at91 u-boot-2009.01 patches - -endchoice - -config BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR - string - depends on BR2_TARGET_U_BOOT_ARCH_PATCH - default "target/device/Atmel/arch-arm/u-boot/2009.01" if BR2_TARGET_U_BOOT_2009_01_ARCH_AT91 - default "" - diff --git a/target/device/Atmel/arch-arm/u-boot/Makefile.in b/target/device/Atmel/arch-arm/u-boot/Makefile.in deleted file mode 100644 index b5981e1..0000000 --- a/target/device/Atmel/arch-arm/u-boot/Makefile.in +++ /dev/null @@ -1,4 +0,0 @@ -ifneq ($(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR),) -U_BOOT_ARCH_PATCH_DIR:=$(call qstrip,$(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR)) -endif - diff --git a/target/device/Config.in.u-boot b/target/device/Config.in.u-boot deleted file mode 100644 index d67aacf..0000000 --- a/target/device/Config.in.u-boot +++ /dev/null @@ -1,9 +0,0 @@ -menuconfig BR2_TARGET_U_BOOT_ARCH_PATCH - bool "Add architecture specific patch" - help - Patch U-Boot for a specific family of chips - -if BR2_TARGET_U_BOOT_ARCH_PATCH -source "target/device/Atmel/arch-arm/u-boot/Config.in" -endif # BR2_TARGET_U_BOOT_ARCH_PATCH - -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 09/49] u-boot: remove u-boot-status make target 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (7 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 08/49] u-boot: remove arch specific patches infrastructure Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 10/49] u-boot: remove reference to old 1.2.0-atmel version Thomas Petazzoni ` (39 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 7e98ca8..466d4a0 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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 - -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 10/49] u-boot: remove reference to old 1.2.0-atmel version 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (8 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 09/49] u-boot: remove u-boot-status make target Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 11/49] u-boot: simplify custom patch handling Thomas Petazzoni ` (38 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 466d4a0..4edef12 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 11/49] u-boot: simplify custom patch handling 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (9 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 10/49] u-boot: remove reference to old 1.2.0-atmel version Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 12/49] u-boot: remove patch for obsolete version Thomas Petazzoni ` (37 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 9 ++++++--- boot/u-boot/u-boot.mk | 10 ++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 4c76d57..78a195d 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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 diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 4edef12..efde3ea 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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 $@ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 12/49] u-boot: remove patch for obsolete version 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (10 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 11/49] u-boot: simplify custom patch handling Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 13/49] u-boot: remove useless symbolic link Thomas Petazzoni ` (36 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- ...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 diff --git a/boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 deleted file mode 100644 index 07cddb0..0000000 --- a/boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 +++ /dev/null @@ -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 */ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 13/49] u-boot: remove useless symbolic link 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (11 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 12/49] u-boot: remove patch for obsolete version Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 14/49] u-boot: support building for mkimage Thomas Petazzoni ` (35 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index efde3ea..ac16c8b 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 14/49] u-boot: support building for mkimage 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (12 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 13/49] u-boot: remove useless symbolic link Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 15/49] u-boot: further simplify the configuration Thomas Petazzoni ` (34 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot To build mkimage for the host (which is needed to build an uImage of the kernel), it is not necessary to configure U-Boot, and therefore to have a particular board selected. Therefore, this commit: * Adds a verification at U-Boot configure step that a U-Boot board name has been defined * Sets a default U-Boot version if none has been specified, so that even when U-Boot isn't selected but we want to build mkimage for the host, a particular U-Boot version is picked. * Make the host mkimage target depend only on U-Boot being downloaded/extracted/patched, and the target mkimage/fw_printenv targets depend on U-Boot being fully configured. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index ac16c8b..00724ba 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -4,6 +4,15 @@ # ############################################################# U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) +U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) + +# U-Boot may not be selected in the configuration, but mkimage might +# be needed to build/prepare a kernel image. In this case, we just +# pick some random stable U-Boot version that will be used just to +# build mkimage. +ifeq ($(U_BOOT_VERSION),) +U_BOOT_VERSION=2010.03 +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,16 @@ $(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) +# 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)/.patched mkdir -p $(@D) - cp -dpf $(U_BOOT_DIR)/tools/mkimage $@ + $(MAKE) -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 +185,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 $@ \ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 15/49] u-boot: further simplify the configuration 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (13 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 14/49] u-boot: support building for mkimage Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 16/49] u-boot: remove unused U_BOOT_TARGET_TOOLS variable Thomas Petazzoni ` (33 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Remove 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 <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 247 ------------------------------------------------- boot/u-boot/u-boot.mk | 113 ++--------------------- 2 files changed, 8 insertions(+), 352 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 78a195d..a4f5fd9 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -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 diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 00724ba..a562da2 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -21,21 +21,9 @@ U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin -U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage -MKIMAGE:=$(U_BOOT_TOOLS) -U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript +MKIMAGE:=$(HOST_DIR)/usr/bin/mkimage -U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) - -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV)),y) -U_BOOT_TARGETS += u-boot-autoscript -endif - -TARGET_UBOOT_IPADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_IPADDR)) -TARGET_UBOOT_SERVERIP:=$(call qstrip,$(BR2_TARGET_UBOOT_SERVERIP)) -TARGET_UBOOT_GATEWAY:=$(call qstrip,$(BR2_TARGET_UBOOT_GATEWAY)) -TARGET_UBOOT_NETMASK:=$(call qstrip,$(BR2_TARGET_UBOOT_NETMASK)) -TARGET_UBOOT_ETHADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_ETHADDR)) +U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(MKIMAGE) # u-boot still uses arch=ppc for powerpc U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc) @@ -87,68 +75,38 @@ endif LDFLAGS="$(TARGET_LDFLAGS)" \ $(U_BOOT_CONFIGURE_OPTS) \ $(MAKE) -C $(U_BOOT_DIR) \ - $(UBOOT_BOARD_NAME)_config + $(U_BOOT_BOARD_NAME)_config touch $@ $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured # Modify configuration header in $(U_BOOT_INC_CONF_FILE) -ifdef BR2_TARGET_UBOOT_DEFAULT_ENV +ifdef BR2_TARGET_UBOOT_NETWORK @echo >> $(U_BOOT_INC_CONF_FILE) @echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE) @echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) @echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) $(call insert_define, DATE, $(DATE)) $(call insert_define, CONFIG_LOAD_SCRIPTS, 1) -endif # BR2_TARGET_UBOOT_DEFAULT_ENV -ifdef BR2_TARGET_UBOOT_NETWORK ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"") $(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR)) +endif ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"") $(call insert_define, CONFIG_GATEWAYIP, $(BR2_TARGET_UBOOT_GATEWAY)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_NETMASK)),"") $(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK)) endif -endif # end BR2_TARGET_U_BOOT_IPADDR ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"") $(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"") $(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR)) endif -ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),) ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"") $(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR)) endif -endif -endif # BR2_TARGET_UBOOT_NETWORK -ifeq ($(BR2_TARGET_UBOOT_SILENT),y) - $(call insert_define, CONFIG_SILENT_CONSOLE,) -endif -ifdef BR2_TARGET_UBOOT_DEFAULT_ENV -ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"") - $(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_LOCATION)),"") - $(call insert_define, KERNEL_LOCATION, $(BR2_TARGET_UBOOT_KERNEL_LOCATION)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_START)),"") - $(call insert_define, FILESYSTEM_START, $(BR2_TARGET_UBOOT_FILESYSTEM_START)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)),"") - $(call insert_define, FILESYSTEM_LOCATION, $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)),"") - $(call insert_define, FILESYSTEM_SIZE, $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_END_OF_FLASH)),"") - $(call insert_define, END_OF_FLASH, $(BR2_TARGET_UBOOT_END_OF_FLASH)) -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"") - $(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE)) -endif @echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE) -endif # BR2_TARGET_UBOOT_DEFAULT_ENV +endif # BR2_TARGET_UBOOT_NETWORK touch $@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified @@ -195,11 +153,9 @@ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured u-boot: $(U_BOOT_TARGETS) -u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).img - u-boot-clean: -$(MAKE) -C $(U_BOOT_DIR) clean - rm -f $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS) + rm -f $(MKIMAGE) $(U_BOOT_TARGET_TOOLS) u-boot-dirclean: rm -rf $(U_BOOT_DIR) @@ -212,59 +168,6 @@ u-boot-configured: $(U_BOOT_DIR)/.header_modified ############################################################# # -# Generate an autoscript with the configration items -# -############################################################# - -$(U_BOOT_AUTOSCRIPT): .config - rm -f $(U_BOOT_AUTOSCRIPT) -ifneq ($(TARGET_UBOOT_IPADDR),) - echo setenv ipaddr $(TARGET_UBOOT_IPADDR) > $(U_BOOT_AUTOSCRIPT) -else - echo TARGET_UBOOT_IPADDR="$(TARGET_UBOOT_IPADDR)" -endif -ifneq ($(TARGET_UBOOT_SERVERIP),) - echo setenv serverip $(TARGET_UBOOT_SERVERIP) >> $(U_BOOT_AUTOSCRIPT) -endif -ifneq ($(TARGET_UBOOT_GATEWAY),) - echo setenv gatewayip $(TARGET_UBOOT_GATEWAY) >> $(U_BOOT_AUTOSCRIPT) -endif -ifneq ($(TARGET_UBOOT_NETMASK),) - echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(U_BOOT_AUTOSCRIPT) -endif - echo setenv linux $(LINUX26_KERNEL_NAME) >> $(U_BOOT_AUTOSCRIPT) - echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT) - echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT) - echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT) - echo setenv fs-date $(DATE) >> $(U_BOOT_AUTOSCRIPT) - echo setenv rd-1 rootfs.$(ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT) - echo setenv rd-2 rootfs.$(ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT) - echo setenv rd rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT) - echo setenv ver 1 >> $(U_BOOT_AUTOSCRIPT) -ifneq ($(TARGET_UBOOT_ETHADDR),) - echo setenv ethaddr $(TARGET_UBOOT_ETHADDR) >> $(U_BOOT_AUTOSCRIPT) -endif - echo setenv fstype ram >> $(U_BOOT_AUTOSCRIPT) - echo fs >> $(U_BOOT_AUTOSCRIPT) - echo os >> $(U_BOOT_AUTOSCRIPT) - echo setargs >> $(U_BOOT_AUTOSCRIPT) - echo saveenv >> $(U_BOOT_AUTOSCRIPT) - -$(U_BOOT_AUTOSCRIPT).img: $(U_BOOT_AUTOSCRIPT) $(MKIMAGE) - $(MKIMAGE) -A $(ARCH) \ - -O linux \ - -T script \ - -C none \ - -a 0 \ - -e 0 \ - -n "autoscr config" \ - -d $(U_BOOT_AUTOSCRIPT) \ - $(U_BOOT_AUTOSCRIPT).img - - - -############################################################# -# # Toplevel Makefile options # ############################################################# @@ -272,7 +175,7 @@ ifeq ($(BR2_TARGET_UBOOT),y) TARGETS+=u-boot # we NEED a board name -ifeq ($(UBOOT_BOARD_NAME),) +ifeq ($(U_BOOT_BOARD_NAME),) $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting) endif -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 16/49] u-boot: remove unused U_BOOT_TARGET_TOOLS variable 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (14 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 15/49] u-boot: further simplify the configuration Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 17/49] u-boot: add a few comments Thomas Petazzoni ` (32 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index a562da2..220eeb2 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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 @@ -155,7 +154,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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 17/49] u-boot: add a few comments 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (15 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 16/49] u-boot: remove unused U_BOOT_TARGET_TOOLS variable Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 18/49] u-boot: re-add infrastructure to specify custom tarball Thomas Petazzoni ` (31 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/u-boot.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 220eeb2..90a45b8 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -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,6 +117,7 @@ $(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)/ @@ -129,6 +131,7 @@ $(MKIMAGE): $(U_BOOT_DIR)/.patched $(MAKE) -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 \ @@ -142,6 +145,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 \ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 18/49] u-boot: re-add infrastructure to specify custom tarball 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (16 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 17/49] u-boot: add a few comments Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 19/49] u-boot: beautify option prompts Thomas Petazzoni ` (30 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot The bootloader being very specific to the hardware, being able to build U-Boot from an arbitrary tarball available on the web might be needed. Therefore, for U-Boot, we provide two methods : * Get a given stable version from U-Boot official FTP server * Get an arbitrary tarball This should hopefully satisfy most needs, without complicating too much the U-Boot build procedure on Buildroot side. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 11 +++++++++++ boot/u-boot/u-boot.mk | 16 ++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index a4f5fd9..79c5c3d 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -25,13 +25,24 @@ config BR2_TARGET_UBOOT_2009_11 config BR2_TARGET_UBOOT_2009_08 bool "u-boot-2009.08" +config BR2_TARGET_UBOOT_CUSTOM_TARBALL + bool "Custom tarball" + endchoice +if BR2_TARGET_UBOOT_CUSTOM_TARBALL + +config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION + string "URL of custom U-Boot tarball" + +endif + config BR2_UBOOT_VERSION string 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 "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR string "custom patch dir" diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 90a45b8..ee56611 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -14,9 +14,17 @@ ifeq ($(U_BOOT_VERSION),) U_BOOT_VERSION=2010.03 endif +ifeq ($(U_BOOT_VERSION),custom) +# Handle custom U-Boot tarballs as specified by the configuration +U_BOOT_TARBALL=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) +U_BOOT_SITE:=$(dir $(U_BOOT_TARBALL)) +U_BOOT_SOURCE:=$(notdir $(U_BOOT_TARBALL)) +else +# Handle stable official U-Boot versions +U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 +endif -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 @@ -51,9 +59,9 @@ $(DL_DIR)/$(U_BOOT_SOURCE): $(call DOWNLOAD,$(U_BOOT_SITE),$(U_BOOT_SOURCE)) $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE) - $(U_BOOT_CAT) $(DL_DIR)/$(U_BOOT_SOURCE) \ - | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - mkdir -p $(U_BOOT_DIR) + mkdir -p $(@D) + $(INFLATE$(suffix $(U_BOOT_SOURCE))) $(DL_DIR)/$(U_BOOT_SOURCE) \ + | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - touch $@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 19/49] u-boot: beautify option prompts 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (17 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 18/49] u-boot: re-add infrastructure to specify custom tarball Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 20/49] u-boot: use BR2_TARGET_UBOOT_VERSION instead of BR2_UBOOT_VERSION Thomas Petazzoni ` (29 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 79c5c3d..00fd03a 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -1,11 +1,11 @@ menuconfig BR2_TARGET_UBOOT - bool "Das U-Boot Boot Monitor" + bool "U-Boot" help Build "Das U-Boot" Boot Monitor if BR2_TARGET_UBOOT config BR2_TARGET_UBOOT_BOARDNAME - string "board name" + string "U-Boot board name" help One of U-Boot supported boards to be built. This will be suffixed with _config to meet U-Boot standard naming. @@ -17,13 +17,13 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_2010_03 - bool "u-boot-2010.03" + bool "2010.03" config BR2_TARGET_UBOOT_2009_11 - bool "u-boot-2009.11" + bool "2009.11" config BR2_TARGET_UBOOT_2009_08 - bool "u-boot-2009.08" + bool "2009.08" config BR2_TARGET_UBOOT_CUSTOM_TARBALL bool "Custom tarball" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 20/49] u-boot: use BR2_TARGET_UBOOT_VERSION instead of BR2_UBOOT_VERSION 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (18 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 19/49] u-boot: beautify option prompts Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 21/49] defconfigs: remove references to old U-Boot versions Thomas Petazzoni ` (28 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot In order to be coherent with all other BR2_TARGET_UBOOT_* options. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/u-boot/Config.in | 2 +- boot/u-boot/u-boot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 00fd03a..aa680cf 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -37,7 +37,7 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION endif -config BR2_UBOOT_VERSION +config BR2_TARGET_UBOOT_VERSION string default "2010.03" if BR2_TARGET_UBOOT_2010_03 default "2009.11" if BR2_TARGET_UBOOT_2009_11 diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index ee56611..ad67343 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -3,7 +3,7 @@ # U-Boot # ############################################################# -U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) +U_BOOT_VERSION:=$(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) # U-Boot may not be selected in the configuration, but mkimage might -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 21/49] defconfigs: remove references to old U-Boot versions 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (19 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 20/49] u-boot: use BR2_TARGET_UBOOT_VERSION instead of BR2_UBOOT_VERSION Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 22/49] grub: remove GRUB_SUPPORTED_ARCH Thomas Petazzoni ` (27 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- configs/at91rm9200df_defconfig | 25 +------------------------ configs/at91rm9200df_ext_defconfig | 25 +------------------------ configs/at91sam9260dfc_defconfig | 25 +------------------------ configs/at91sam9260dfc_ext_defconfig | 25 +------------------------ configs/at91sam9261ek_defconfig | 25 +------------------------ configs/at91sam9261ek_ext_defconfig | 25 +------------------------ configs/at91sam9263ek_defconfig | 25 +------------------------ configs/at91sam9263ek_ext_defconfig | 25 +------------------------ configs/at91sam9g20dfc_defconfig | 25 +------------------------ configs/at91sam9g20dfc_ext_defconfig | 25 +------------------------ configs/atngw100-base_defconfig | 8 +------- configs/atngw100_defconfig | 27 +-------------------------- configs/atstk1005_defconfig | 8 +------- configs/atstk100x_defconfig | 8 +------- configs/integrator926_defconfig | 8 +------- configs/integrator926_huge_defconfig | 8 +------- configs/v100sc2_defconfig | 3 +-- 17 files changed, 17 insertions(+), 303 deletions(-) diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig index 7d2bcfd..afa0aaf 100644 --- a/configs/at91rm9200df_defconfig +++ b/configs/at91rm9200df_defconfig @@ -883,14 +883,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -898,23 +894,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -922,11 +903,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig index 79e55fc..d549eac 100644 --- a/configs/at91rm9200df_ext_defconfig +++ b/configs/at91rm9200df_ext_defconfig @@ -809,14 +809,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -824,23 +820,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -848,11 +829,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index 087067f..3865f6a 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -897,14 +897,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -912,23 +908,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -936,11 +917,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig index e52cd2d..46218a0 100644 --- a/configs/at91sam9260dfc_ext_defconfig +++ b/configs/at91sam9260dfc_ext_defconfig @@ -817,14 +817,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig index cd7483b..2f0bd52 100644 --- a/configs/at91sam9261ek_defconfig +++ b/configs/at91sam9261ek_defconfig @@ -949,14 +949,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -964,23 +960,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -988,11 +969,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig index 5ab47ad..afb5fbe 100644 --- a/configs/at91sam9261ek_ext_defconfig +++ b/configs/at91sam9261ek_ext_defconfig @@ -906,14 +906,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -921,23 +917,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -945,11 +926,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig index bc95b6b..22c4c0c 100644 --- a/configs/at91sam9263ek_defconfig +++ b/configs/at91sam9263ek_defconfig @@ -946,14 +946,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -961,23 +957,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -985,11 +966,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig index 9771c83..f93b10a 100644 --- a/configs/at91sam9263ek_ext_defconfig +++ b/configs/at91sam9263ek_ext_defconfig @@ -868,14 +868,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -883,23 +879,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -907,11 +888,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 30cc4e1..3b53329 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -813,14 +813,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -828,23 +824,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="256M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -852,11 +833,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig index e18754e..053a9aa 100644 --- a/configs/at91sam9g20dfc_ext_defconfig +++ b/configs/at91sam9g20dfc_ext_defconfig @@ -817,14 +817,10 @@ 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 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set @@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set BR2_TARGET_UBOOT_BOOTSOURCE="dataflash" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="64M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set @@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF" -BR2_TARGET_UBOOT_KERNEL_START="21000000" BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig index d3092df..4b5b633 100644 --- a/configs/atngw100-base_defconfig +++ b/configs/atngw100-base_defconfig @@ -739,16 +739,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -# BR2_TARGET_UBOOT_DEFAULT_ENV is not set # # Kernel diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index d7c9c15..0c22b90 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -740,35 +740,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -BR2_TARGET_UBOOT_DEFAULT_ENV=y -BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y -# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set -# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set -BR2_TARGET_UBOOT_MEMORY_SIZE="256M" -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set -BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set -# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set -BR2_TARGET_UBOOT_KERNEL_START="21000000" -BR2_TARGET_UBOOT_FILESYSTEM_START="21210000" -BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000" BR2_TARGET_UBOOT_NETWORK=y BR2_TARGET_UBOOT_SERVERIP="10.175.196.221" BR2_TARGET_UBOOT_IPADDR="10.175.196.18" diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig index a1fe0b7..213157b 100644 --- a/configs/atstk1005_defconfig +++ b/configs/atstk1005_defconfig @@ -771,16 +771,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -# BR2_TARGET_UBOOT_DEFAULT_ENV is not set # # Kernel diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index 0fbbf14..bbdf26f 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -868,16 +868,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -# BR2_TARGET_UBOOT_DEFAULT_ENV is not set # # Kernel diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig index 3879272..2c11692 100644 --- a/configs/integrator926_defconfig +++ b/configs/integrator926_defconfig @@ -706,16 +706,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -# BR2_TARGET_UBOOT_DEFAULT_ENV is not set # # Kernel diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig index 86443db..4aacbcb 100644 --- a/configs/integrator926_huge_defconfig +++ b/configs/integrator926_huge_defconfig @@ -682,16 +682,10 @@ 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 -BR2_TARGET_UBOOT_CUSTOM_PATCH="" -# BR2_TARGET_UBOOT_SILENT is not set +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -# BR2_TARGET_UBOOT_DEFAULT_ENV is not set # # Kernel diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index 0ad7ab0..1ee7a9e 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -706,13 +706,12 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS="" # BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="atngw100" -BR2_TARGET_UBOOT_CUSTOM_PATCH="" +BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" BR2_TARGET_UBOOT_SERVERIP="192.168.1.254" BR2_TARGET_UBOOT_IPADDR="192.168.1.60" BR2_TARGET_UBOOT_GATEWAY="192.168.1.254" BR2_TARGET_UBOOT_NETMASK="255.255.255.0" BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18" -# BR2_TARGET_UBOOT_SILENT is not set # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set # BR2_TARGET_UBOOT_TOOL_ENV is not set -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 22/49] grub: remove GRUB_SUPPORTED_ARCH 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (20 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 21/49] defconfigs: remove references to old U-Boot versions Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 23/49] grub2: remove GRUB2_ARCH_SUPPORTED Thomas Petazzoni ` (26 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot grub 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 <thomas.petazzoni@free-electrons.com> --- boot/grub/grub.mk | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 80f9b6d..96b082d 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 23/49] grub2: remove GRUB2_ARCH_SUPPORTED 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (21 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 22/49] grub: remove GRUB_SUPPORTED_ARCH Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 24/49] grub/grub2: drop unnecessary dependency on uclibc Thomas Petazzoni ` (25 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/grub2/grub2.mk | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 119397b..a298ae6 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 24/49] grub/grub2: drop unnecessary dependency on uclibc 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (22 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 23/49] grub2: remove GRUB2_ARCH_SUPPORTED Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 25/49] grub/grub2: update splash image location Thomas Petazzoni ` (24 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/grub/grub.mk | 2 +- boot/grub2/grub2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 96b082d..74ea77f 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -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 diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index a298ae6..06e1524 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 25/49] grub/grub2: update splash image location 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (23 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 24/49] grub/grub2: drop unnecessary dependency on uclibc Thomas Petazzoni @ 2010-06-12 14:21 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 26/49] grub2: bump version Thomas Petazzoni ` (23 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/grub/grub.mk | 2 +- boot/grub2/grub2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 74ea77f..3805afe 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -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 diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 06e1524..24f1e1a 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 26/49] grub2: bump version 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (24 preceding siblings ...) 2010-06-12 14:21 ` [Buildroot] [PATCH 25/49] grub/grub2: update splash image location Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 27/49] grub2: fix build Thomas Petazzoni ` (22 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/grub2/grub2.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 24f1e1a..4af6c02 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 27/49] grub2: fix build 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (25 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 26/49] grub2: bump version Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 28/49] grub2: remove non-existing options Thomas Petazzoni ` (21 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot grub2 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 <thomas.petazzoni@free-electrons.com> --- 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 diff --git a/boot/grub2/grub-1.95-001-fix-grub-install.patch b/boot/grub2/grub-1.95-001-fix-grub-install.patch deleted file mode 100644 index 3287b61..0000000 --- a/boot/grub2/grub-1.95-001-fix-grub-install.patch +++ /dev/null @@ -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@ diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 4af6c02..95fa245 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -2,6 +2,15 @@ # # grub2 # +# TODO +# +# * grub2's autogen uses ruby, which isn't part of the core Debian +# installation. So either decide it is a requirement for Buildroot, +# or build it for the host. +# +# * improve the installation procedure. For the moment, it just +# installs everything in $(TARGET_DIR). +# ############################################################# GRUB2_SOURCE:=grub2_1.98.orig.tar.gz GRUB2_PATCH:=grub2_1.98-1.diff.gz @@ -13,13 +22,11 @@ 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 @@ -53,16 +60,19 @@ $(DL_DIR)/$(GRUB2_PATCH): grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH) $(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH) - $(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(GRUB2_DIR) $(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); \ + mkdir -p $(@D) + $(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) -xvf - + toolchain/patch-kernel.sh $(@D) $(DL_DIR) $(GRUB2_PATCH) + for i in `grep -v "^#" $(@D)/debian/patches/00list`; do \ + cat $(@D)/debian/patches/$$i | patch -p1 -d $(@D); \ done - toolchain/patch-kernel.sh $(GRUB2_DIR) boot/grub2 grub-\*.patch + toolchain/patch-kernel.sh $(@D) boot/grub2 grub-\*.patch touch $@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked (cd $(GRUB2_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) ; \ + ./autogen.sh ; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ CPPFLAGS="$(GRUB2_CFLAGS)" \ @@ -74,33 +84,28 @@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked --prefix=/ \ --mandir=/usr/man \ --infodir=/usr/info \ - --disable-auto-linux-mem-opt \ + --disable-grub-mkfont \ + --disable-grub-fstest \ + --disable-grub-emu-usb \ + --disable-werror \ $(DISABLE_LARGEFILE) \ $(GRUB2_CONFIG-y) \ ) touch $@ -$(GRUB2_DIR)/$(GRUB2_BINARY): $(GRUB2_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(GRUB2_DIR) +$(GRUB2_DIR)/.compiled: $(GRUB2_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(@D) + touch $@ -$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/$(GRUB2_BINARY) - cp $(GRUB2_DIR)/$(GRUB2_BINARY) $(TARGET_DIR)/$(GRUB2_TARGET_BINARY) - test -d $(TARGET_DIR)/boot/grub2 || mkdir -p $(TARGET_DIR)/boot/grub2 - cp $(GRUB2_DIR)/stage1/stage1 $(GRUB2_DIR)/stage2/*1_5 $(GRUB2_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub2/ -ifeq ($(BR2_TARGET_GRUB2_SPLASH),y) - test -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) || \ - cp $(GRUB2_SPLASHIMAGE) $(TARGET_DIR)/boot/grub2/ -endif +$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/.compiled + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install touch $@ -grub2: $(GRUB2_DIR)/.installed +grub2: host-automake host-autoconf $(GRUB2_DIR)/.installed grub2-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall -$(MAKE) -C $(GRUB2_DIR) clean - rm -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) \ - $(TARGET_DIR)/sbin/$(GRUB2_BINARY) \ - $(TARGET_DIR)/boot/grub2/{stage{1,2},*1_5} grub2-dirclean: rm -rf $(GRUB2_DIR) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 28/49] grub2: remove non-existing options 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (26 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 27/49] grub2: fix build Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 29/49] grub2: only available on x86 and PowerPC and mark as BROKEN Thomas Petazzoni ` (20 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Much 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 <thomas.petazzoni@free-electrons.com> --- boot/grub2/Config.in | 9 --------- boot/grub2/grub2.mk | 27 --------------------------- 2 files changed, 0 insertions(+), 36 deletions(-) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 7526399..d27cb4c 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -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. diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 95fa245..6c3bbef 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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)) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 29/49] grub2: only available on x86 and PowerPC and mark as BROKEN 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (27 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 28/49] grub2: remove non-existing options Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 30/49] syslinux: bump version and fix build Thomas Petazzoni ` (19 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot The 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 <thomas.petazzoni@free-electrons.com> --- boot/grub2/Config.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index d27cb4c..1301b5b 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -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. -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 30/49] syslinux: bump version and fix build 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (28 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 29/49] grub2: only available on x86 and PowerPC and mark as BROKEN Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 31/49] syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check Thomas Petazzoni ` (18 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- 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 diff --git a/boot/syslinux/syslinux-3.82-makefile.patch b/boot/syslinux/syslinux-3.82-makefile.patch deleted file mode 100644 index 9e98a78..0000000 --- a/boot/syslinux/syslinux-3.82-makefile.patch +++ /dev/null @@ -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. diff --git a/boot/syslinux/syslinux-3.85-makefile.patch b/boot/syslinux/syslinux-3.85-makefile.patch new file mode 100644 index 0000000..ff85b8d --- /dev/null +++ b/boot/syslinux/syslinux-3.85-makefile.patch @@ -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) + diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index df27b6d..46b41f2 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -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: -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 31/49] syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (29 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 30/49] syslinux: bump version and fix build Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 32/49] nasm: new package, needed for syslinux Thomas Petazzoni ` (17 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/syslinux/syslinux.mk | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 46b41f2..966d0c2 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 32/49] nasm: new package, needed for syslinux 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (30 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 31/49] syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 33/49] syslinux: depends on host-nasm Thomas Petazzoni ` (16 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/nasm/nasm.mk | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 package/nasm/nasm.mk diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk new file mode 100644 index 0000000..08983e1 --- /dev/null +++ b/package/nasm/nasm.mk @@ -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)) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 33/49] syslinux: depends on host-nasm 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (31 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 32/49] nasm: new package, needed for syslinux Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 34/49] at91bootstrap: do not default to $(BOARD_NAME) Thomas Petazzoni ` (15 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/syslinux/syslinux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 966d0c2..192e905 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 34/49] at91bootstrap: do not default to $(BOARD_NAME) 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (32 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 33/49] syslinux: depends on host-nasm Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 35/49] at91bootstrap: simplify configuration Thomas Petazzoni ` (14 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/Config.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 44db8f5..8514ccc 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 35/49] at91bootstrap: simplify configuration 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (33 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 34/49] at91bootstrap: do not default to $(BOARD_NAME) Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 36/49] at91bootstrap: fix the boot source selection Thomas Petazzoni ` (13 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot There 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 <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/Config.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 8514ccc..8efbd13 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 36/49] at91bootstrap: fix the boot source selection 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (34 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 35/49] at91bootstrap: simplify configuration Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 37/49] at91bootstrap: fix incorrect config option comment Thomas Petazzoni ` (12 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot The 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 <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/Config.in | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 8efbd13..7c0f393 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 37/49] at91bootstrap: fix incorrect config option comment 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (35 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 36/49] at91bootstrap: fix the boot source selection Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 38/49] at91bootstrap: remove unused/useless code Thomas Petazzoni ` (11 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/Config.in | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 7c0f393..1bf8d50 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -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" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 38/49] at91bootstrap: remove unused/useless code 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (36 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 37/49] at91bootstrap: fix incorrect config option comment Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 39/49] at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set Thomas Petazzoni ` (10 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index dc475e4..1d1091e 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 39/49] at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (37 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 38/49] at91bootstrap: remove unused/useless code Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 40/49] at91bootstrap: bump version to 2.13 Thomas Petazzoni ` (9 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index 1d1091e..b71df89 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 40/49] at91bootstrap: bump version to 2.13 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (38 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 39/49] at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 41/49] at91bootstrap: don't use the ATMEL_MIRROR thing Thomas Petazzoni ` (8 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot At the same time, remove the unused AT91BOOTSTRAP_PATCH_LEVEL and AT91BOOTSTRAP_PATCHED_VERSION variables. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index b71df89..d6e2c18 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 41/49] at91bootstrap: don't use the ATMEL_MIRROR thing 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (39 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 40/49] at91bootstrap: bump version to 2.13 Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 42/49] at91bootstrap: fix install procedure Thomas Petazzoni ` (7 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index d6e2c18..bad5cee 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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)) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 42/49] at91bootstrap: fix install procedure 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (40 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 41/49] at91bootstrap: don't use the ATMEL_MIRROR thing Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 43/49] at91bootstrap: fix AT91BOOTSTRAP_BINARY Thomas Petazzoni ` (6 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index bad5cee..fc7206e 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 43/49] at91bootstrap: fix AT91BOOTSTRAP_BINARY 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (41 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 42/49] at91bootstrap: fix install procedure Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 44/49] at91dataflashboot: fix configuration options Thomas Petazzoni ` (5 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Use AT91BOOTSTRAP_BOARD instead of BOARD_NAME. Remove AT91BOOTSTRAP_VERSION from the final binary image name. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91bootstrap/at91bootstrap.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index fc7206e..9030696 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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)) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 44/49] at91dataflashboot: fix configuration options 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (42 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 43/49] at91bootstrap: fix AT91BOOTSTRAP_BINARY Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 45/49] at91dataflashboot: various fixes Thomas Petazzoni ` (4 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91dataflashboot/Config.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in index c6711c4..25b9723 100644 --- a/boot/at91dataflashboot/Config.in +++ b/boot/at91dataflashboot/Config.in @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 45/49] at91dataflashboot: various fixes 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (43 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 44/49] at91dataflashboot: fix configuration options Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 46/49] at91dataflashboot: add a patch step Thomas Petazzoni ` (3 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Fix the URL, fix the directory to which it gets unpacked, fix make target names to be lower-case only. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91dataflashboot/at91dataflashboot.mk | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 519328c..dcbe1ef 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 46/49] at91dataflashboot: add a patch step 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (44 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 45/49] at91dataflashboot: various fixes Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 47/49] at91dataflashboot: add two patches Thomas Petazzoni ` (2 subsequent siblings) 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/at91dataflashboot/at91dataflashboot.mk | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index dcbe1ef..d11f842 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 47/49] at91dataflashboot: add two patches 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (45 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 46/49] at91dataflashboot: add a patch step Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 48/49] Add support for the Barebox bootloader Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage Thomas Petazzoni 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot The 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 <thomas.petazzoni@free-electrons.com> --- .../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 diff --git a/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch b/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch new file mode 100644 index 0000000..41d97ad --- /dev/null +++ b/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch @@ -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 <thomas.petazzoni@free-electrons.com> +--- + 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 diff --git a/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch b/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch new file mode 100644 index 0000000..e38905f --- /dev/null +++ b/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch @@ -0,0 +1,43 @@ +Get at91dataflashboot to build with EABI toolchains, by providing the +__aeabi_uidiv and __aeabi_uidivmod symbols. The code is based on +U-Boot's code. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + _udivsi3.S | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +Index: DataflashBoot-1.05/_udivsi3.S +=================================================================== +--- DataflashBoot-1.05.orig/_udivsi3.S ++++ DataflashBoot-1.05/_udivsi3.S +@@ -12,8 +12,11 @@ + .text + .globl __udivsi3 + .type __udivsi3 ,function ++ .globl __aeabi_uidiv ++ .type __aeabi_uidiv ,function + .align 0 + __udivsi3 : ++ __aeabi_uidiv: + cmp divisor, #0 + beq Ldiv0 + mov curbit, #1 +@@ -68,6 +71,17 @@ + mov r0, #0 @ about as wrong as it could be + ldmia sp!, {pc} + .size __udivsi3 , . - __udivsi3 ++ ++.globl __aeabi_uidivmod ++__aeabi_uidivmod: ++ ++ stmfd sp!, {r0, r1, ip, lr} ++ bl __aeabi_uidiv ++ ldmfd sp!, {r1, r2, ip, lr} ++ mul r3, r0, r2 ++ sub r1, r1, r3 ++ mov pc, lr ++ + /* # 235 "libgcc1.S" */ + /* # 320 "libgcc1.S" */ + /* # 421 "libgcc1.S" */ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 48/49] Add support for the Barebox bootloader 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (46 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 47/49] at91dataflashboot: add two patches Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage Thomas Petazzoni 48 siblings, 0 replies; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- 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 diff --git a/boot/Config.in b/boot/Config.in index 78ff82c..6bcc98a 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -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" diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in new file mode 100644 index 0000000..0c90f03 --- /dev/null +++ b/boot/barebox/Config.in @@ -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 diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk new file mode 100644 index 0000000..7c2cbc1 --- /dev/null +++ b/boot/barebox/barebox.mk @@ -0,0 +1,61 @@ +############################################################# +# +# Barebox +# +############################################################# + +BAREBOX_VERSION:=2010.05.0 +BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2 +BAREBOX_SITE:=http://www.barebox.org/download/ +BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION) +BAREBOX_CAT:=$(BZCAT) +BAREBOX_BOARD_DEFCONFIG:=$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG)) + +ifeq ($(KERNEL_ARCH),i386) +BAREBOX_ARCH=x86 +else ifeq ($(KERNEL_ARCH),powerpc) +BAREBOX_ARCH=ppc +else +BAREBOX_ARCH=$(KERNEL_ARCH) +endif + +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE=$(TARGET_CROSS) + +$(DL_DIR)/$(BAREBOX_SOURCE): + $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE)) + +$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE) + mkdir -p $(@D) + $(INFLATE$(suffix $(BAREBOX_SOURCE))) $(DL_DIR)/$(BAREBOX_SOURCE) \ + | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + touch $@ + +$(BAREBOX_DIR)/.patched: $(BAREBOX_DIR)/.unpacked + toolchain/patch-kernel.sh $(BAREBOX_DIR) boot/barebox \ + barebox-$(BAREBOX_VERSION)-\*.patch \ + barebox-$(BAREBOX_VERSION)-\*.patch.$(ARCH) + touch $@ + +$(BAREBOX_DIR)/.configured: $(BAREBOX_DIR)/.patched + $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) $(BAREBOX_BOARD_DEFCONFIG)_defconfig + touch $@ + +$(BAREBOX_DIR)/.built: $(BAREBOX_DIR)/.configured + $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) + touch $@ + +$(BAREBOX_DIR)/.installed: $(BAREBOX_DIR)/.built + cp $(BAREBOX_DIR)/barebox.bin $(BINARIES_DIR) + touch $@ + +barebox: $(BAREBOX_DIR)/.installed + +ifeq ($(BR2_TARGET_BAREBOX),y) +TARGETS+=barebox + +# we NEED a board defconfig file +ifeq ($(BAREBOX_BOARD_DEFCONFIG),) +$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting) +endif + +endif -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni ` (47 preceding siblings ...) 2010-06-12 14:22 ` [Buildroot] [PATCH 48/49] Add support for the Barebox bootloader Thomas Petazzoni @ 2010-06-12 14:22 ` Thomas Petazzoni 2010-06-13 13:51 ` Thomas Petazzoni 48 siblings, 1 reply; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-12 14:22 UTC (permalink / raw) To: buildroot After the rework of the U-Boot configuration/compilation process, we need to slightly rework how target/linux/Makefile.in.advanced depends on mkimage on the host to produce an uImage. target/linux/Makefile.in doesn't need to be fixed as it just doesn't handle this dependency for the moment. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- target/linux/Config.in.advanced | 1 - target/linux/Makefile.in.advanced | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced index d6c8559..645ed2e 100644 --- a/target/linux/Config.in.advanced +++ b/target/linux/Config.in.advanced @@ -383,7 +383,6 @@ config BR2_LINUX_BIN_BZIMAGE config BR2_LINUX_BIN_UIMAGE bool "uImage" depends on BR2_PACKAGE_LINUX - select BR2_TARGET_UBOOT config BR2_LINUX_BIN_VMLINUX bool "vmlinux" diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 86d94ca..cc9d1e1 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -137,8 +137,8 @@ endif # -------------- # UIMAGE ifeq ($(LINUX26_FORMAT),uImage) -LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools -LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage +LINUX26_MKIMAGE_DIR:=$(MKIMAGE) +LINUX26_MKIMAGE_DEP:=$(MKIMAGE) ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) endif -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage 2010-06-12 14:22 ` [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage Thomas Petazzoni @ 2010-06-13 13:51 ` Thomas Petazzoni 2010-06-13 14:58 ` Peter Korsgaard 0 siblings, 1 reply; 53+ messages in thread From: Thomas Petazzoni @ 2010-06-13 13:51 UTC (permalink / raw) To: buildroot On Sat, 12 Jun 2010 16:22:23 +0200 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > -LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools I've pushed a modified version of this commit that gets rid of LINUX26_MKIMAGE_DIR. This was a comment from Peter that I forgot to fix before reposting the big patchset. Unless explictly asked to do so, I will not resend the full set of patches just for this change. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 53+ messages in thread
* [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage 2010-06-13 13:51 ` Thomas Petazzoni @ 2010-06-13 14:58 ` Peter Korsgaard 0 siblings, 0 replies; 53+ messages in thread From: Peter Korsgaard @ 2010-06-13 14:58 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> On Sat, 12 Jun 2010 16:22:23 +0200 Thomas> Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: >> -LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools Thomas> I've pushed a modified version of this commit that gets rid of Thomas> LINUX26_MKIMAGE_DIR. This was a comment from Peter that I forgot to fix Thomas> before reposting the big patchset. Ok, thanks. Thomas> Unless explictly asked to do so, I will not resend the full set of Thomas> patches just for this change. Fine. I'll pull tonight and test. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2010-06-14 13:51 UTC | newest] Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-06-12 14:21 [Buildroot] [pull request] Pull request for branch bootloaders-cleanup Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 01/49] bootloaders: move bootloader build code to boot/ Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 02/49] yaboot: drop support Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 03/49] boot: remove references to COPYTO Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 04/49] u-boot: do not default to $(BOARD_NAME) for the board name Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 05/49] u-boot: remove ancient versions Thomas Petazzoni 2010-06-14 13:51 ` Jonathan dumaresq 2010-06-12 14:21 ` [Buildroot] [PATCH 06/49] u-boot: rename Makefile.in to u-boot.mk for coherency Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 07/49] u-boot: remove option to configure download site Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 08/49] u-boot: remove arch specific patches infrastructure Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 09/49] u-boot: remove u-boot-status make target Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 10/49] u-boot: remove reference to old 1.2.0-atmel version Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 11/49] u-boot: simplify custom patch handling Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 12/49] u-boot: remove patch for obsolete version Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 13/49] u-boot: remove useless symbolic link Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 14/49] u-boot: support building for mkimage Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 15/49] u-boot: further simplify the configuration Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 16/49] u-boot: remove unused U_BOOT_TARGET_TOOLS variable Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 17/49] u-boot: add a few comments Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 18/49] u-boot: re-add infrastructure to specify custom tarball Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 19/49] u-boot: beautify option prompts Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 20/49] u-boot: use BR2_TARGET_UBOOT_VERSION instead of BR2_UBOOT_VERSION Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 21/49] defconfigs: remove references to old U-Boot versions Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 22/49] grub: remove GRUB_SUPPORTED_ARCH Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 23/49] grub2: remove GRUB2_ARCH_SUPPORTED Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 24/49] grub/grub2: drop unnecessary dependency on uclibc Thomas Petazzoni 2010-06-12 14:21 ` [Buildroot] [PATCH 25/49] grub/grub2: update splash image location Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 26/49] grub2: bump version Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 27/49] grub2: fix build Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 28/49] grub2: remove non-existing options Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 29/49] grub2: only available on x86 and PowerPC and mark as BROKEN Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 30/49] syslinux: bump version and fix build Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 31/49] syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH check Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 32/49] nasm: new package, needed for syslinux Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 33/49] syslinux: depends on host-nasm Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 34/49] at91bootstrap: do not default to $(BOARD_NAME) Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 35/49] at91bootstrap: simplify configuration Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 36/49] at91bootstrap: fix the boot source selection Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 37/49] at91bootstrap: fix incorrect config option comment Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 38/49] at91bootstrap: remove unused/useless code Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 39/49] at91bootstrap: add a check to verify that BR2_TARGET_AT91BOOTSTRAP_BOARD is set Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 40/49] at91bootstrap: bump version to 2.13 Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 41/49] at91bootstrap: don't use the ATMEL_MIRROR thing Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 42/49] at91bootstrap: fix install procedure Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 43/49] at91bootstrap: fix AT91BOOTSTRAP_BINARY Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 44/49] at91dataflashboot: fix configuration options Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 45/49] at91dataflashboot: various fixes Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 46/49] at91dataflashboot: add a patch step Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 47/49] at91dataflashboot: add two patches Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 48/49] Add support for the Barebox bootloader Thomas Petazzoni 2010-06-12 14:22 ` [Buildroot] [PATCH 49/49] linux: fix dependency on mkimage Thomas Petazzoni 2010-06-13 13:51 ` Thomas Petazzoni 2010-06-13 14:58 ` Peter Korsgaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.