mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-19 11:18:28 +00:00
e856bdcfb4
We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
not completed. Finish this work by the tool.
During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will
make the code more readable. Besides, negative meaning symbols do
not fit in obj-$(CONFIG_...) style Makefiles.
This commit was created as follows:
[1] Edit "default n" to "default y" in the config entry in
common/Kconfig.
[2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"
[3] Rename the instances in defconfigs by the following:
find . -path './configs/*_defconfig' | xargs sed -i \
-e '/CONFIG_SYS_NO_FLASH=y/d' \
-e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'
[4] Change the conditionals by the following:
find . -name '*.[ch]' | xargs sed -i \
-e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
-e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
-e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
-e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'
[5] Modify the following manually
- Rename the rest of instances
- Remove the description from README
- Create the new Kconfig entry in drivers/mtd/Kconfig
- Remove the old Kconfig entry from common/Kconfig
- Remove the garbage comments from include/configs/*.h
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
108 lines
3.4 KiB
C
108 lines
3.4 KiB
C
/*
|
|
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#ifndef __CONFIG_DENX_MCVEVK_H__
|
|
#define __CONFIG_DENX_MCVEVK_H__
|
|
|
|
#include <asm/arch/base_addr_ac5.h>
|
|
|
|
/* U-Boot Commands */
|
|
#define CONFIG_FAT_WRITE
|
|
#define CONFIG_HW_WATCHDOG
|
|
|
|
/* Memory configurations */
|
|
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on MCV */
|
|
|
|
/* Booting Linux */
|
|
#define CONFIG_BOOTFILE "fitImage"
|
|
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
|
|
#define CONFIG_PREBOOT "run try_bootscript"
|
|
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
|
|
#define CONFIG_LOADADDR 0x01000000
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
/* Environment is in MMC */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
#define CONFIG_ENV_IS_IN_MMC
|
|
|
|
/* Extra Environment */
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"consdev=ttyS0\0" \
|
|
"baudrate=115200\0" \
|
|
"bootscript=boot.scr\0" \
|
|
"bootdev=/dev/mmcblk0p2\0" \
|
|
"rootdev=/dev/mmcblk0p3\0" \
|
|
"netdev=eth0\0" \
|
|
"hostname=mcvevk\0" \
|
|
"kernel_addr_r=0x10000000\0" \
|
|
"update_filename=u-boot-with-spl.sfp\0" \
|
|
"update_sd_offset=0x800\0" \
|
|
"update_sd=" /* Update the SD firmware partition */ \
|
|
"if mmc rescan ; then " \
|
|
"if tftp ${update_filename} ; then " \
|
|
"setexpr fw_sz ${filesize} / 0x200 ; " /* SD block size */ \
|
|
"setexpr fw_sz ${fw_sz} + 1 ; " \
|
|
"mmc write ${loadaddr} ${update_sd_offset} ${fw_sz} ; " \
|
|
"fi ; " \
|
|
"fi\0" \
|
|
"update_qspi_offset=0x0\0" \
|
|
"update_qspi=" /* Update the QSPI firmware */ \
|
|
"if sf probe ; then " \
|
|
"if tftp ${update_filename} ; then " \
|
|
"sf update ${loadaddr} ${update_qspi_offset} ${filesize} ; " \
|
|
"fi ; " \
|
|
"fi\0" \
|
|
"fpga_filename=output_file.rbf\0" \
|
|
"load_fpga=" /* Load FPGA bitstream */ \
|
|
"if tftp ${fpga_filename} ; then " \
|
|
"fpga load 0 $loadaddr $filesize ; " \
|
|
"bridge enable ; " \
|
|
"fi\0" \
|
|
"addcons=" \
|
|
"setenv bootargs ${bootargs} " \
|
|
"console=${consdev},${baudrate}\0" \
|
|
"addip=" \
|
|
"setenv bootargs ${bootargs} " \
|
|
"ip=${ipaddr}:${serverip}:${gatewayip}:" \
|
|
"${netmask}:${hostname}:${netdev}:off\0" \
|
|
"addmisc=" \
|
|
"setenv bootargs ${bootargs} ${miscargs}\0" \
|
|
"addargs=run addcons addmisc\0" \
|
|
"mmcload=" \
|
|
"mmc rescan ; " \
|
|
"load mmc 0:2 ${kernel_addr_r} ${bootfile}\0" \
|
|
"netload=" \
|
|
"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \
|
|
"miscargs=nohlt panic=1\0" \
|
|
"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \
|
|
"nfsargs=" \
|
|
"setenv bootargs root=/dev/nfs rw " \
|
|
"nfsroot=${serverip}:${rootpath},v3,tcp\0" \
|
|
"mmc_mmc=" \
|
|
"run mmcload mmcargs addargs ; " \
|
|
"bootm ${kernel_addr_r}\0" \
|
|
"mmc_nfs=" \
|
|
"run mmcload nfsargs addip addargs ; " \
|
|
"bootm ${kernel_addr_r}\0" \
|
|
"net_mmc=" \
|
|
"run netload mmcargs addargs ; " \
|
|
"bootm ${kernel_addr_r}\0" \
|
|
"net_nfs=" \
|
|
"run netload nfsargs addip addargs ; " \
|
|
"bootm ${kernel_addr_r}\0" \
|
|
"try_bootscript=" \
|
|
"mmc rescan;" \
|
|
"if test -e mmc 0:2 ${bootscript} ; then " \
|
|
"if load mmc 0:2 ${kernel_addr_r} ${bootscript};" \
|
|
"then ; " \
|
|
"echo Running bootscript... ; " \
|
|
"source ${kernel_addr_r} ; " \
|
|
"fi ; " \
|
|
"fi\0"
|
|
|
|
/* The rest of the configuration is shared */
|
|
#include <configs/socfpga_common.h>
|
|
|
|
#endif /* __CONFIG_DENX_MCVEVK_H__ */
|