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
ARM: Move SYS_CACHELINE_SIZE over to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
rpi.h
diff --git
a/include/configs/rpi.h
b/include/configs/rpi.h
index
b83d622
..
752cc31
100644
(file)
--- a/
include/configs/rpi.h
+++ b/
include/configs/rpi.h
@@
-14,12
+14,6
@@
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#ifdef CONFIG_BCM2835
-#define CONFIG_SYS_CACHELINE_SIZE 32
-#else
-#define CONFIG_SYS_CACHELINE_SIZE 64
-#endif
-
/* Architecture, CPU, etc.*/
#define CONFIG_ARCH_CPU_INIT
/* Architecture, CPU, etc.*/
#define CONFIG_ARCH_CPU_INIT
@@
-48,7
+42,11
@@
/* Memory layout */
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* Memory layout */
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#ifdef CONFIG_ARM64
+#define CONFIG_SYS_TEXT_BASE 0x00080000
+#else
#define CONFIG_SYS_TEXT_BASE 0x00008000
#define CONFIG_SYS_TEXT_BASE 0x00008000
+#endif
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
/*
* The board really has 256M. However, the VC (VideoCore co-processor) shares
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
/*
* The board really has 256M. However, the VC (VideoCore co-processor) shares
@@
-92,7
+90,6
@@
#define CONFIG_MMC_SDHCI_IO_ACCESSORS
#define CONFIG_BCM2835_SDHCI
#define CONFIG_MMC_SDHCI_IO_ACCESSORS
#define CONFIG_BCM2835_SDHCI
-#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
#ifndef CONFIG_BCM2835
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
#ifndef CONFIG_BCM2835
@@
-103,6
+100,7
@@
#define CONFIG_USB_STORAGE
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_SMSC95XX
#define CONFIG_USB_STORAGE
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_SMSC95XX
+#define CONFIG_TFTP_TSIZE
#define CONFIG_MISC_INIT_R
#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_MISC_INIT_R
#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL
@@
-141,7
+139,6
@@
#define CONFIG_COMMAND_HISTORY
/* Commands */
#define CONFIG_COMMAND_HISTORY
/* Commands */
-#define CONFIG_CMD_MMC
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
@@
-211,6
+208,5
@@
ENV_MEM_LAYOUT_SETTINGS \
BOOTENV
ENV_MEM_LAYOUT_SETTINGS \
BOOTENV
-#define CONFIG_BOOTDELAY 2
#endif
#endif