projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
pm9g45.h
diff --git
a/include/configs/pm9g45.h
b/include/configs/pm9g45.h
index
d3beaf3
..
460933f
100644
(file)
--- a/
include/configs/pm9g45.h
+++ b/
include/configs/pm9g45.h
@@
-5,7
+5,7
@@
* Ronetix GmbH <www.ronetix.at>
*
* (C) Copyright 2007-2008
* Ronetix GmbH <www.ronetix.at>
*
* (C) Copyright 2007-2008
- * Stelian Pop <stelian
.pop@leadtechdesign.com
>
+ * Stelian Pop <stelian
@popies.net
>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the PM9G45 board.
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the PM9G45 board.
@@
-57,6
+57,7
@@
#define CONFIG_INITRD_TAG 1
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_INITRD_TAG 1
#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
/*
* Hardware drivers
@@
-114,7
+115,6
@@
/* NAND flash */
#ifdef CONFIG_CMD_NAND
/* NAND flash */
#ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_MAX_CHIPS 1
#define CONFIG_NAND_ATMEL
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_NAND_ATMEL
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000
@@
-167,7
+167,6
@@
"rootfstype=jffs2"
#define CONFIG_BAUDRATE 115200
"rootfstype=jffs2"
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
@@
-178,7
+177,6
@@
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
/*
* Size of malloc() pool
/*
* Size of malloc() pool
@@
-190,10
+188,4
@@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
GENERATED_GBL_DATA_SIZE)
-#define CONFIG_STACKSIZE (32*1024) /* regular stack */
-
-#ifdef CONFIG_USE_IRQ
-#error CONFIG_USE_IRQ not supported
-#endif
-
#endif
#endif