diff options
| author | wdenk <wdenk> | 2003-12-07 18:32:37 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-12-07 18:32:37 +0000 |
| commit | a2663ea4fc9d18cb8000c97ed92c3c668eda8e04 (patch) | |
| tree | 9eb328b497d6f482e5571635fa00b1d0cae5b185 /include/configs/dbau1x00.h | |
| parent | ef5a9672c778e22ecb522db625b5df78ea40ed23 (diff) | |
| download | talos-obmc-uboot-a2663ea4fc9d18cb8000c97ed92c3c668eda8e04.tar.gz talos-obmc-uboot-a2663ea4fc9d18cb8000c97ed92c3c668eda8e04.zip | |
* Patches by David Müller, 14 Nov 2003:
- board/mpl/common/common_util.c
* implement support for BZIP2 compressed images
* various cleanups (printf -> puts, ...)
- board/mpl/common/flash.c
* report correct errors to upper layers
* check the erase fail and VPP low bits in status reg
- board/mpl/vcma9/cmd_vcma9.c
- board/mpl/vcma9/flash.c
* various cleanups (printf -> puts, ...)
- common/cmd_usb.c
* fix typo in comment
- cpu/arm920t/usb_ohci.c
* support for S3C2410 is missing in #if line
- drivers/cs8900.c
* reinit some registers in case of error (cable missing, ...)
- fs/fat/fat.c
* support for USB/MMC devices is missing in #if line
- include/configs/MIP405.h
- include/configs/PIP405.h
* enable BZIP2 support
* enlarge malloc space to 1MiB because of BZIP2 support
- include/configs/VCMA9.h
* enable BZIP2 support
* enlarge malloc space to 1MiB because of BZIP2 support
* enable USB support
- lib_arm/armlinux.c
* change calling convention of ARM Linux kernel as
described on http://www.arm.linux.org.uk/developer/booting.php
* Patch by Thomas Lange, 14 Nov 2003:
Split dbau1x00 into dbau1000, dbau1100 and dbau1500 configs to
support all these AMD boards.
* Patch by Thomas Lange, 14 Nov 2003:
Workaround for mips au1x00 physical memory accesses (the au1x00
uses a 36 bit bus internally and cannot access physical memory
directly. Use the uncached SDRAM address instead of the physical
one.)
Diffstat (limited to 'include/configs/dbau1x00.h')
| -rw-r--r-- | include/configs/dbau1x00.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 7aa90b76d8..6f647f2e8b 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -32,9 +32,20 @@ #define CONFIG_DBAU1X00 1 #define CONFIG_AU1X00 1 /* alchemy series cpu */ +#ifdef CONFIG_DBAU1000 /* Also known as Merlot */ -#define CONFIG_DBAU1000 1 /* board, Hardcoded for now */ -#define CONFIG_AU1000 1 /* cpu, Hardcoded for now */ +#define CONFIG_AU1000 1 +#else +#ifdef CONFIG_DBAU1100 +#define CONFIG_AU1100 1 +#else +#ifdef CONFIG_DBAU1500 +#define CONFIG_AU1500 1 +#else +#error "No valid board set" +#endif +#endif +#endif #define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */ |
