mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 22:32:27 +02:00
17c7b6c3fd
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73
92 lines
3.1 KiB
Diff
92 lines
3.1 KiB
Diff
--- u-boot-1.1.4/cpu/arm920t/config.mk 2005-12-16 17:39:27.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/cpu/arm920t/config.mk 2006-02-27 19:07:41.000000000 +0100
|
|
@@ -30,5 +30,5 @@
|
|
# Supply options according to compiler version
|
|
#
|
|
# =========================================================================
|
|
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
|
|
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
|
|
PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
|
|
--- u-boot-1.1.4/cpu/arm920t/start.S 2005-12-16 17:39:27.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/cpu/arm920t/start.S 2006-02-22 16:45:24.000000000 +0100
|
|
@@ -237,6 +237,7 @@
|
|
*/
|
|
|
|
|
|
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
|
cpu_init_crit:
|
|
/*
|
|
* flush v4 I/D caches
|
|
@@ -265,6 +266,7 @@
|
|
mov lr, ip
|
|
mov pc, lr
|
|
|
|
+#endif
|
|
|
|
/*
|
|
*************************************************************************
|
|
--- u-boot-1.1.4/examples/Makefile 2005-12-16 17:39:27.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/examples/Makefile 2006-03-02 02:37:14.000000000 +0100
|
|
@@ -30,7 +30,7 @@
|
|
endif
|
|
|
|
ifeq ($(ARCH),arm)
|
|
-LOAD_ADDR = 0xc100000
|
|
+LOAD_ADDR = 0x21000000
|
|
endif
|
|
|
|
ifeq ($(ARCH),mips)
|
|
--- u-boot-1.1.4/include/config.h 1970-01-01 01:00:00.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/include/config.h 2006-02-27 19:04:46.000000000 +0100
|
|
@@ -0,0 +1,2 @@
|
|
+/* Automatically generated - do not edit */
|
|
+#include <configs/at91rm9200dk.h>
|
|
--- u-boot-1.1.4/include/config.mk 1970-01-01 01:00:00.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/include/config.mk 2006-02-27 19:04:46.000000000 +0100
|
|
@@ -0,0 +1,4 @@
|
|
+ARCH = arm
|
|
+CPU = arm920t
|
|
+BOARD = at91rm9200dk
|
|
+SOC = at91rm9200
|
|
--- u-boot-1.1.4/include/configs/at91rm9200dk.h 2005-12-16 17:39:27.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/include/configs/at91rm9200dk.h 2006-02-26 22:44:17.000000000 +0100
|
|
@@ -25,6 +25,11 @@
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
+// Added 2 defines to skip re-init lowlevel and relocate HCG HLH
|
|
+//
|
|
+#define CONFIG_SKIP_LOWLEVEL_INIT
|
|
+#define CONFIG_SKIP_RELOCATE_UBOOT
|
|
+
|
|
/* 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) */
|
|
@@ -165,12 +170,12 @@
|
|
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
|
|
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
|
|
|
|
-#undef CFG_ENV_IS_IN_DATAFLASH
|
|
+#define CFG_ENV_IS_IN_DATAFLASH
|
|
|
|
#ifdef CFG_ENV_IS_IN_DATAFLASH
|
|
-#define CFG_ENV_OFFSET 0x20000
|
|
+#define CFG_ENV_OFFSET 0x21000
|
|
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
|
|
-#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
|
+#define CFG_ENV_SIZE 0x8400 /* 0x8000 */
|
|
#else
|
|
#define CFG_ENV_IS_IN_FLASH 1
|
|
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
|
--- u-boot-1.1.4/Makefile 2005-12-16 17:39:27.000000000 +0100
|
|
+++ u-boot-1.1.4.klaus/Makefile 2006-03-02 02:49:23.000000000 +0100
|
|
@@ -57,7 +57,7 @@
|
|
CROSS_COMPILE = powerpc-linux-
|
|
endif
|
|
ifeq ($(ARCH),arm)
|
|
-CROSS_COMPILE = arm-linux-
|
|
+CROSS_COMPILE = ../staging_dir/bin/arm-linux-
|
|
endif
|
|
ifeq ($(ARCH),i386)
|
|
ifeq ($(HOSTARCH),i387)
|