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
/
pm9g45.h
diff --git
a/include/configs/pm9g45.h
b/include/configs/pm9g45.h
index a8dc0f0b032692b594190579500642369cdd6238..ede0ee1f122344383e04b6dce66544da0c6efab0 100644
(file)
--- a/
include/configs/pm9g45.h
+++ b/
include/configs/pm9g45.h
@@
-22,7
+22,6
@@
*/
#include <asm/hardware.h>
*/
#include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
@@
-72,10
+71,6
@@
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
-
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_PING 1
#define CONFIG_CMD_DHCP 1
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_PING 1
#define CONFIG_CMD_DHCP 1
@@
-96,7
+91,6
@@
/* NOR flash, not available */
#define CONFIG_SYS_NO_FLASH 1
/* NOR flash, not available */
#define CONFIG_SYS_NO_FLASH 1
-#undef CONFIG_CMD_FLASH
/* NAND flash */
#ifdef CONFIG_CMD_NAND
/* NAND flash */
#ifdef CONFIG_CMD_NAND
@@
-154,7
+148,6
@@
#define CONFIG_BAUDRATE 115200
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \