projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparc
[oweals/u-boot.git]
/
include
/
configs
/
highbank.h
diff --git
a/include/configs/highbank.h
b/include/configs/highbank.h
index da1c837cc7a6efdd28b1f75355b2c6697ac95de9..f02575ac04cfe8ffb416a75bfcc21f43afd67309 100644
(file)
--- a/
include/configs/highbank.h
+++ b/
include/configs/highbank.h
@@
-13,7
+13,6
@@
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_OF_BOARD_SETUP
#define CONFIG_FIT
#define CONFIG_OF_BOARD_SETUP
#define CONFIG_FIT
@@
-54,18
+53,11
@@
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_LOADS
#define CONFIG_CMD_SCSI
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_CMD_SCSI
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n", bootdelay
-#define CONFIG_AUTOBOOT_KEYED_CTRLC
+
/*
* Miscellaneous configurable options
*/
/*
* Miscellaneous configurable options
*/
@@
-82,8
+74,9
@@
/*-----------------------------------------------------------------------
* Physical Memory Map
/*-----------------------------------------------------------------------
* Physical Memory Map
+ * The DRAM is already setup, so do not touch the DT node later.
*/
*/
-#define CONFIG_NR_DRAM_BANKS
1
+#define CONFIG_NR_DRAM_BANKS
0
#define PHYS_SDRAM_1_SIZE (4089 << 20)
#define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1_SIZE - 0x100000)
#define PHYS_SDRAM_1_SIZE (4089 << 20)
#define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1_SIZE - 0x100000)