Merge branch 'master' of git://git.denx.de/u-boot-sh
This commit is contained in:
commit
a314ec1bfd
@ -6,4 +6,4 @@
|
||||
# (C) Copyright 2007
|
||||
# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
||||
#
|
||||
PLATFORM_CPPFLAGS += -m4-nofpu
|
||||
PLATFORM_CPPFLAGS += $(call cc-option,-m4-nofpu,-m4)
|
||||
|
@ -25,6 +25,7 @@ ENTRY(_start)
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = CONFIG_SYS_TEXT_BASE;
|
||||
reloc_dst = .;
|
||||
|
||||
PROVIDE (_ftext = .);
|
||||
|
@ -21,6 +21,7 @@
|
||||
#size-cells = <2>;
|
||||
#interrupt-cells = <1>;
|
||||
ranges = <0x01000000 0 0xfe240000 0 0xfe240000 0 0x00040000
|
||||
0x02000000 0 0xfd000000 0 0xfd000000 0 0x01000000>;
|
||||
0x02000000 0 0xfd000000 0 0xfd000000 0 0x01000000
|
||||
0x42000000 0 0x0c000000 0 0x8c000000 0 0x04000000>;
|
||||
};
|
||||
};
|
||||
|
@ -12,6 +12,7 @@ CONFIG_CMD_DM=y
|
||||
CONFIG_CMD_IDE=y
|
||||
CONFIG_CMD_PCI=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_DHCP=y
|
||||
CONFIG_CMD_PING=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_EXT2=y
|
||||
|
Loading…
Reference in New Issue
Block a user