diff options
| author | wdenk <wdenk> | 2004-01-02 16:05:07 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-01-02 16:05:07 +0000 |
| commit | b6e4c4033c4f889c452c511d38c77808c67f9cf7 (patch) | |
| tree | 73a39833805f4cf47588dd1616a1b479ab58a418 /lib_arm | |
| parent | 63f3491242df8e6bd1b5df7296f28959989e2eaf (diff) | |
| download | blackbird-obmc-uboot-b6e4c4033c4f889c452c511d38c77808c67f9cf7.tar.gz blackbird-obmc-uboot-b6e4c4033c4f889c452c511d38c77808c67f9cf7.zip | |
* Patch by Denis Peter, 8 Dec 2003
- add support for the PATI board (MPC555)
- add SPI support for the MPC5xx
* Patch by Anders Larsen, 08 Dec 2003:
add configuration options CONFIG_SERIAL_TAG and CONFIG_REVISION_TAG
to pass ATAG_SERIAL and ATAG_REVISION, resp., to the ARM target;
cleanup some redundand #defines
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/armlinux.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c index 19680b58a5..e96ea81527 100644 --- a/lib_arm/armlinux.c +++ b/lib_arm/armlinux.c @@ -30,16 +30,14 @@ #include <dataflash.h> #endif -#include <asm/setup.h> -#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2) -#define tag_next(t) ((struct tag *)((u32 *)(t) + (t)->hdr.size)) - /*cmd_boot.c*/ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_INITRD_TAG) || \ + defined (CONFIG_SERIAL_TAG) || \ + defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_VFD) static void setup_start_tag (bd_t *bd); @@ -221,8 +219,16 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_INITRD_TAG) || \ + defined (CONFIG_SERIAL_TAG) || \ + defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_VFD) setup_start_tag (bd); +#ifdef CONFIG_SERIAL_TAG + setup_serial_tag (¶ms); +#endif +#ifdef CONFIG_REVISION_TAG + setup_revision_tag (¶ms); +#endif #ifdef CONFIG_SETUP_MEMORY_TAGS setup_memory_tags (bd); #endif @@ -251,6 +257,8 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_INITRD_TAG) || \ + defined (CONFIG_SERIAL_TAG) || \ + defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_VFD) static void setup_start_tag (bd_t *bd) { @@ -308,10 +316,6 @@ static void setup_commandline_tag (bd_t *bd, char *commandline) } -#ifndef ATAG_INITRD2 -#define ATAG_INITRD2 0x54420005 -#endif - #ifdef CONFIG_INITRD_TAG static void setup_initrd_tag (bd_t *bd, ulong initrd_start, ulong initrd_end) { |
