X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fsocfpga_arria5_secu1.h;h=55168c2fb8fd3611051985a0eaea3c63466208a1;hb=6786ce1ce14feb4d02854a0c04bc0cce505be46e;hp=b059100ccd420b7ace0ba3f3661ac219cf996b99;hpb=468ba8d00b5af7828302e297736ae23d4873cfb0;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index b059100..55168c2 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2017-2020 ABB
+ * Copyright (C) 2017-2020 Hitachi Power Grids
  *
  */
 #ifndef __CONFIG_SOCFPGA_SECU1_H__
@@ -8,12 +8,8 @@
 
 #include <asm/arch/base_addr_ac5.h>
 
-/* Call misc_init_r */
-#define CONFIG_MISC_INIT_R
-
-#define CONFIG_HUSH_INIT_VAR
 /* Eternal oscillator */
-#define CONFIG_SYS_TIMER_RATE	40000000
+#define CFG_SYS_TIMER_RATE	40000000
 
 /* Memory configurations */
 #define PHYS_SDRAM_1_SIZE	0x20000000	/* 512MiB on SECU1 */
@@ -24,108 +20,9 @@
  * the last two bytes of the 128 bytes large NVRAM in the
  * RTC which begin at address 0x20
  */
-#define CONFIG_SYS_I2C_RTC_ADDR         0x68
-
-/* Booting Linux */
-#define CONFIG_BOOTDELAY	2
-#define CONFIG_BOOTFILE		"zImage"
-#define CONFIG_BOOTARGS		\
-	"console=ttyS0," __stringify(CONFIG_BAUDRATE) \
-	" ubi.fm_autoconvert=1" \
-	" uio_pdrv_genirq.of_id=\"idq,regbank\""
-
-#define CONFIG_BOOTCOMMAND	\
-	"setenv bootcmd '"	\
-		"bridge enable; "	\
-		"if test ${bootnum} = \"b\"; " \
-		      "then run _fpga_loadsafe; " \
-		"else if test ${bootcount} -eq 4; then echo \"Switching copy...\"; setexpr x $bootnum % 2 && setexpr bootnum $x + 1; saveenv; fi; " \
-		      "run _fpga_loaduser; " \
-		"fi;" \
-		"echo \"Booting bank $bootnum\" && run userload && run userboot;" \
-	"' && " \
-	"setenv altbootcmd 'setenv bootnum b && saveenv && boot;' && " \
-	"saveenv && saveenv && boot;"
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SYS_BOOTM_LEN		(64 << 20)
-
-/* Environment settings */
-#define CONFIG_ENV_OVERWRITE
-
-/*
- * Autoboot
- *
- * After 45s of inactivity in the prompt, the board will reset.
- * Set 'bootretry' in the environment to -1 to disable this behavior
- */
-#define CONFIG_BOOT_RETRY_TIME 45
-#define CONFIG_RESET_TO_RETRY
-
-#define CONFIG_LOADADDR		0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_KM_KERNEL_ADDR
-
-/*
- * FPGA Remote Update related environment
- *
- * Note that since those commands access the FPGA, the HPS-to-FPGA
- * bridges MUST have been previously enabled (for example
- * with 'bridge enable').
- */
-#define FPGA_RMTU_ENV \
-	"rmtu_page=0xFF29000C\0" \
-	"rmtu_reconfig=0xFF290018\0" \
-	"fpga_safebase=0x0\0" \
-	"fpga_userbase=0x2000000\0" \
-	"_fpga_loaduser=echo Loading FPGA USER image..." \
-		" && mw ${rmtu_page} ${fpga_userbase} && mw ${rmtu_reconfig} 1\0" \
-	"_fpga_loadsafe=echo Loading FPGA SAFE image..." \
-		" && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \
-
-#define CONFIG_KM_NEW_ENV \
-	"newenv=" \
-		"nand erase 0x100000 0x40000\0"
-
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS \
-	"release=" \
-		"run newenv; reset\0" \
-	"develop=" \
-		"tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	FPGA_RMTU_ENV \
-	CONFIG_KM_DEF_ENV_BOOTTARGETS \
-	CONFIG_KM_NEW_ENV \
-	"socfpga_legacy_reset_compat=1\0"	\
-	"altbootcmd=run bootcmd;\0"	\
-	"bootlimit=6\0"	\
-	"bootnum=1\0" \
-	"bootretry=" __stringify(CONFIG_BOOT_RETRY_TIME) "\0" \
-	"fdt_addr=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \
-	"load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp\0" \
-	"loadaddr=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \
-	"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-	"update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize}\0" \
-	"userload=ubi part nand.ubi &&" \
-		"ubi check rootfs$bootnum &&" \
-		"ubi read $fdt_addr dtb$bootnum &&" \
-		"ubi read $loadaddr kernel$bootnum\0" \
-	"userboot=setenv bootargs " CONFIG_BOOTARGS \
-		" ubi.mtd=1 ubi.block=0,rootfs$bootnum root=/dev/ubiblock0_$ubivolid"	\
-		" ro rootfstype=squashfs init=sbin/preinit;" \
-		"bootz ${loadaddr} - ${fdt_addr}\0" \
-	"verify=y\0"
+#define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
-#ifdef CONFIG_SPL_NAND_SUPPORT
-#undef CONFIG_SYS_NAND_U_BOOT_OFFS
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
-#endif
-
-#undef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS	60000
-
 #endif	/* __CONFIG_SOCFPGA_SECU1_H__ */