mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-07 05:13:21 +09: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>
101 lines
2.1 KiB
C
101 lines
2.1 KiB
C
/*
|
|
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0
|
|
*/
|
|
|
|
#ifndef __MX6_COMMON_H
|
|
#define __MX6_COMMON_H
|
|
|
|
#ifndef CONFIG_MX6UL
|
|
#define CONFIG_ARM_ERRATA_743622
|
|
#define CONFIG_ARM_ERRATA_751472
|
|
#define CONFIG_ARM_ERRATA_794072
|
|
#define CONFIG_ARM_ERRATA_761320
|
|
|
|
#ifndef CONFIG_SYS_L2CACHE_OFF
|
|
#define CONFIG_SYS_L2_PL310
|
|
#define CONFIG_SYS_PL310_BASE L2_PL310_BASE
|
|
#endif
|
|
|
|
#define CONFIG_MP
|
|
#endif
|
|
#define CONFIG_BOARD_POSTCLK_INIT
|
|
#define CONFIG_MXC_GPT_HCLK
|
|
|
|
#define CONFIG_SYS_BOOTM_LEN 0x1000000
|
|
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <asm/imx-common/gpio.h>
|
|
|
|
#ifndef CONFIG_MX6
|
|
#define CONFIG_MX6
|
|
#endif
|
|
|
|
#define CONFIG_SYS_FSL_CLK
|
|
|
|
/* ATAGs */
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
/* Boot options */
|
|
#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \
|
|
defined(CONFIG_MX6UL) || defined(CONFIG_MX6SLL))
|
|
#define CONFIG_LOADADDR 0x82000000
|
|
#ifndef CONFIG_SYS_TEXT_BASE
|
|
#define CONFIG_SYS_TEXT_BASE 0x87800000
|
|
#endif
|
|
#else
|
|
#define CONFIG_LOADADDR 0x12000000
|
|
#ifndef CONFIG_SYS_TEXT_BASE
|
|
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
|
#endif
|
|
#endif
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
#define CONFIG_CONS_INDEX 1
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* Filesystems and image support */
|
|
#define CONFIG_SUPPORT_RAW_INITRD
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_AUTO_COMPLETE
|
|
#define CONFIG_SYS_CBSIZE 512
|
|
#define CONFIG_SYS_MAXARGS 32
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
|
|
#ifndef CONFIG_SYS_DCACHE_OFF
|
|
#endif
|
|
|
|
/* GPIO */
|
|
#define CONFIG_MXC_GPIO
|
|
|
|
/* MMC */
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
#define CONFIG_FSL_ESDHC
|
|
#define CONFIG_FSL_USDHC
|
|
|
|
/* Fuses */
|
|
#define CONFIG_CMD_FUSE
|
|
#define CONFIG_MXC_OCOTP
|
|
|
|
/* Secure boot (HAB) support */
|
|
#ifdef CONFIG_SECURE_BOOT
|
|
#define CONFIG_CSF_SIZE 0x2000
|
|
#define CONFIG_FSL_CAAM
|
|
#define CONFIG_CMD_DEKBLOB
|
|
#ifdef CONFIG_SPL_BUILD
|
|
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|