diff options
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | board/eric/config.mk | 3 | ||||
| -rw-r--r-- | cpu/mips/config.mk | 10 | ||||
| -rw-r--r-- | include/configs/lwmon.h | 17 |
4 files changed, 31 insertions, 5 deletions
@@ -2,6 +2,12 @@ Changes since U-Boot 1.1.1: ====================================================================== +* Fix configuration for ERIC board (needs more room) + +* Adjust MIPS compiler options at run-time depending on tools version + ("-march=4kc -mtune=4kc -Wa,-mips_allow_branch_to_undefined" for new, + "-mcpu=4kc" for old tools) + * Add passing of the command line and memory size information to the kernel on xaeniax board. diff --git a/board/eric/config.mk b/board/eric/config.mk index c7552a3..dd0b412 100644 --- a/board/eric/config.mk +++ b/board/eric/config.mk @@ -26,5 +26,4 @@ # #TEXT_BASE = 0xFFF80000 -#TEXT_BASE = 0xFFFC0000 -TEXT_BASE = 0xFFFE0000 +TEXT_BASE = 0xFFFC0000 diff --git a/cpu/mips/config.mk b/cpu/mips/config.mk index 1664e14..3c9aab8 100644 --- a/cpu/mips/config.mk +++ b/cpu/mips/config.mk @@ -20,5 +20,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # +v=$(shell \ +mips-linux-as --version|grep "GNU assembler"|awk '{print $$3}'|awk -F . '{print $$2}') +MIPSFLAGS=$(shell \ +if [ "$v" -lt "14" ]; then \ + echo "-mcpu=4kc -EB -mabicalls"; \ +else \ + echo "-march=4kc -mtune=4kc -Wa,-mips_allow_branch_to_undefined -EB -mabicalls"; \ +fi) -PLATFORM_CPPFLAGS += -mcpu=4kc -EB -mabicalls +PLATFORM_CPPFLAGS += $(MIPSFLAGS) diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 74186a8..3ed4727 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -39,6 +39,14 @@ #define CONFIG_MPC823 1 /* This is a MPC823E CPU */ #define CONFIG_LWMON 1 /* ...on a LWMON board */ +/* Default Ethernet MAC address */ +#define CONFIG_ETHADDR 00:11:B0:00:00:00 + +/* The default Ethernet MAC address can be overwritten just once */ +#ifdef CONFIG_ETHADDR +#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 +#endif + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_BOARD_POSTCLK_INIT 1 /* Call board_postclk_init */ @@ -76,17 +84,22 @@ CFG_POST_SPR | \ CFG_POST_SYSMON) -#define CONFIG_BOOTCOMMAND "run flash_self" - /* * Keyboard commands: * # = 0x28 = ENTER : enable bootmessages on LCD * 2 = 0x3A+0x3C = F1 + F3 : enable update mode * 3 = 0x3C+0x3F = F3 + F6 : enable test mode */ + +#define CONFIG_BOOTCOMMAND "autoscr 40040000;saveenv" + +/* "gatewayip=10.8.211.250\0" \ */ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_addr=40080000\0" \ "ramdisk_addr=40280000\0" \ + "netmask=255.255.192.0\0" \ + "serverip=10.8.2.101\0" \ + "ipaddr=10.8.57.0\0" \ "magic_keys=#23\0" \ "key_magic#=28\0" \ "key_cmd#=setenv addfb setenv 'bootargs $bootargs console=tty0'\0" \ |