1 --- u-boot-1.1.4/cpu/arm920t/config.mk 2005-12-16 17:39:27.000000000 +0100
2 +++ u-boot-1.1.4.klaus/cpu/arm920t/config.mk 2006-02-27 19:07:41.000000000 +0100
4 # Supply options according to compiler version
6 # =========================================================================
7 -PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
8 +PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
9 PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
10 --- u-boot-1.1.4/cpu/arm920t/start.S 2005-12-16 17:39:27.000000000 +0100
11 +++ u-boot-1.1.4.klaus/cpu/arm920t/start.S 2006-02-22 16:45:24.000000000 +0100
16 +#ifndef CONFIG_SKIP_LOWLEVEL_INIT
27 *************************************************************************
28 --- u-boot-1.1.4/examples/Makefile 2005-12-16 17:39:27.000000000 +0100
29 +++ u-boot-1.1.4.klaus/examples/Makefile 2006-03-02 02:37:14.000000000 +0100
34 -LOAD_ADDR = 0xc100000
35 +LOAD_ADDR = 0x21000000
39 --- u-boot-1.1.4/include/config.h 1970-01-01 01:00:00.000000000 +0100
40 +++ u-boot-1.1.4.klaus/include/config.h 2006-02-27 19:04:46.000000000 +0100
42 +/* Automatically generated - do not edit */
43 +#include <configs/at91rm9200dk.h>
44 --- u-boot-1.1.4/include/config.mk 1970-01-01 01:00:00.000000000 +0100
45 +++ u-boot-1.1.4.klaus/include/config.mk 2006-02-27 19:04:46.000000000 +0100
51 --- u-boot-1.1.4/include/configs/at91rm9200dk.h 2005-12-16 17:39:27.000000000 +0100
52 +++ u-boot-1.1.4.klaus/include/configs/at91rm9200dk.h 2006-02-26 22:44:17.000000000 +0100
57 +// Added 2 defines to skip re-init lowlevel and relocate HCG HLH
59 +#define CONFIG_SKIP_LOWLEVEL_INIT
60 +#define CONFIG_SKIP_RELOCATE_UBOOT
62 /* ARM asynchronous clock */
63 #define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */
64 #define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */
66 #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
67 #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
69 -#undef CFG_ENV_IS_IN_DATAFLASH
70 +#define CFG_ENV_IS_IN_DATAFLASH
72 #ifdef CFG_ENV_IS_IN_DATAFLASH
73 -#define CFG_ENV_OFFSET 0x20000
74 +#define CFG_ENV_OFFSET 0x21000
75 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
76 -#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
77 +#define CFG_ENV_SIZE 0x8400 /* 0x8000 */
79 #define CFG_ENV_IS_IN_FLASH 1
80 #ifdef CONFIG_SKIP_LOWLEVEL_INIT
81 --- u-boot-1.1.4/Makefile 2005-12-16 17:39:27.000000000 +0100
82 +++ u-boot-1.1.4.klaus/Makefile 2006-03-02 02:49:23.000000000 +0100
84 CROSS_COMPILE = powerpc-linux-
87 -CROSS_COMPILE = arm-linux-
88 +CROSS_COMPILE = ../staging_dir/bin/arm-linux-
91 ifeq ($(HOSTARCH),i387)