summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-11 11:50:49 -0400
committerTom Rini <trini@konsulko.com>2020-07-11 11:50:49 -0400
commit610e1487c8921d266f5cb304bfb66eb71f1dc7dc (patch)
tree68991565dbed957030795ef3229020e1207709d3 /include/configs
parent4a9146c29573dbfa661918280d9522a01f6ca919 (diff)
parent5785950369cd68d4409bf4d0e34d4b1894e5d0e9 (diff)
downloadu-boot-610e1487c8921d266f5cb304bfb66eb71f1dc7dc.tar.gz
u-boot-610e1487c8921d266f5cb304bfb66eb71f1dc7dc.tar.bz2
u-boot-610e1487c8921d266f5cb304bfb66eb71f1dc7dc.zip
Merge tag 'uniphier-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.10 - remove workaround for Cortex-A72 - increase U-Boot proper size to 2MB - sync DT with Linux - add system bus controller driver - improve serial driver - add reset assertion to Denali NAND driver
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/uniphier.h24
1 files changed, 2 insertions, 22 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 55fa85ed62..03bbbab3cf 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -41,32 +41,12 @@
#define CONFIG_ARMV7_PSCI_1_0
-/*-----------------------------------------------------------------------
- * MMU and Cache Setting
- *----------------------------------------------------------------------*/
-
#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
#define CONFIG_TIMESTAMP
-/* FLASH related */
-
-#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_MONITOR_BASE 0
-#define CONFIG_SYS_MONITOR_LEN 0x000d0000 /* 832KB */
-#define CONFIG_SYS_FLASH_BASE 0
-
-/*
- * flash_toggle does not work for our support card.
- * We need to use flash_status_poll.
- */
-#define CONFIG_SYS_CFI_FLASH_STATUS_POLL
-
-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
-
-#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
-
-/* serial console configuration */
+#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
@@ -221,7 +201,7 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE)
/* only for SPL */
-#define CONFIG_SPL_STACK (0x00200000)
+#define CONFIG_SPL_STACK (0x00100000)
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000