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
sf: Move SPI flash drivers to defconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
rpi-common.h
diff --git
a/include/configs/rpi-common.h
b/include/configs/rpi-common.h
index
b54cf8b
..
1b83eb3
100644
(file)
--- a/
include/configs/rpi-common.h
+++ b/
include/configs/rpi-common.h
@@
-11,10
+11,8
@@
#include <asm/arch/timer.h>
/* Architecture, CPU, etc.*/
#include <asm/arch/timer.h>
/* Architecture, CPU, etc.*/
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_BCM2835
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BCM2835
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_SYS_TIMER_RATE 1000000
#define CONFIG_SYS_TIMER_COUNTER \
#define CONFIG_SYS_TIMER_RATE 1000000
#define CONFIG_SYS_TIMER_COUNTER \
@@
-116,12
+114,9
@@
/* Shell */
#define CONFIG_SYS_MAXARGS 8
/* Shell */
#define CONFIG_SYS_MAXARGS 8
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_COMMAND_HISTORY
/* Commands */
#define CONFIG_COMMAND_HISTORY
/* Commands */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_GPIO
#define CONFIG_CMD_MMC
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#define CONFIG_CMD_MMC
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
@@
-135,10
+130,8
@@
#include <config_distro_defaults.h>
#include <config_distro_defaults.h>
-/* Some things don't make sense on this HW or yet */
-#undef CONFIG_CMD_FPGA
-
/* Environment */
/* Environment */
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define ENV_DEVICE_SETTINGS \
"stdin=serial,lcd\0" \
"stdout=serial,lcd\0" \
#define ENV_DEVICE_SETTINGS \
"stdin=serial,lcd\0" \
"stdout=serial,lcd\0" \
@@
-169,10
+162,10
@@
* for the FDT/DTB to be up to 1M, which is hopefully plenty.
*/
#define ENV_MEM_LAYOUT_SETTINGS \
* for the FDT/DTB to be up to 1M, which is hopefully plenty.
*/
#define ENV_MEM_LAYOUT_SETTINGS \
- "
scriptaddr=0x000000
00\0" \
+ "
fdt_addr_r=0x000001
00\0" \
"pxefile_addr_r=0x00100000\0" \
"kernel_addr_r=0x01000000\0" \
"pxefile_addr_r=0x00100000\0" \
"kernel_addr_r=0x01000000\0" \
- "
fdt_addr_
r=0x02000000\0" \
+ "
scriptadd
r=0x02000000\0" \
"ramdisk_addr_r=0x02100000\0" \
#define BOOT_TARGET_DEVICES(func) \
"ramdisk_addr_r=0x02100000\0" \
#define BOOT_TARGET_DEVICES(func) \