mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 14:10:43 +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>
46 lines
1.1 KiB
C
46 lines
1.1 KiB
C
/*
|
|
* Copyright (C) 2014 Marek Vasut <marex@denx.de>
|
|
* Copyright (C) 2016 Pavel Machek <pavel@denx.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#ifndef __CONFIG_SOCFPGA_IS1_H__
|
|
#define __CONFIG_SOCFPGA_IS1_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 0x10000000
|
|
|
|
/* Booting Linux */
|
|
#define CONFIG_BOOTFILE "zImage"
|
|
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
|
|
#define CONFIG_LOADADDR 0x01000000
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
|
|
|
/* Ethernet on SoC (EMAC) */
|
|
#if defined(CONFIG_CMD_NET)
|
|
#define CONFIG_ARP_TIMEOUT 500UL
|
|
|
|
/* PHY */
|
|
#define CONFIG_PHY_MICREL
|
|
#define CONFIG_PHY_MICREL_KSZ9021
|
|
#endif
|
|
|
|
/* The rest of the configuration is shared */
|
|
#include <configs/socfpga_common.h>
|
|
|
|
/*
|
|
* Bootcounter
|
|
*/
|
|
#define CONFIG_BOOTCOUNT_LIMIT
|
|
/* last 2 lwords in OCRAM */
|
|
#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8
|
|
#define CONFIG_SYS_BOOTCOUNT_BE
|
|
|
|
#endif /* __CONFIG_SOCFPGA_IS1_H__ */
|