mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +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>
68 lines
2 KiB
C
68 lines
2 KiB
C
/*
|
|
* (C) Copyright 2016 Savoir-faire Linux Inc.
|
|
*
|
|
* Author: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
|
|
*
|
|
* Derived from MX28EVK code by
|
|
* Fabio Estevam <fabio.estevam@freescale.com>
|
|
* Freescale Semiconductor, Inc.
|
|
*
|
|
* Configuration settings for the TS4600 Board
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#ifndef __CONFIGS_TS4600_H__
|
|
#define __CONFIGS_TS4600_H__
|
|
|
|
/* System configurations */
|
|
#define CONFIG_MX28 /* i.MX28 SoC */
|
|
|
|
/* U-Boot Commands */
|
|
|
|
/* Memory configuration */
|
|
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
|
|
#define PHYS_SDRAM_1 0x40000000 /* Base address */
|
|
#define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
|
|
|
/* Environment */
|
|
#define CONFIG_ENV_SIZE (8 * 1024)
|
|
|
|
/* Environment is in MMC */
|
|
#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
|
|
#define CONFIG_ENV_OFFSET (256 * 1024)
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
#endif
|
|
|
|
/* Boot Linux */
|
|
#define CONFIG_LOADADDR 0x42000000
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
/* Extra Environment */
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"fdt_addr=0x41000000\0" \
|
|
"loadkernel=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
|
|
"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} imx28-ts4600.dtb\0" \
|
|
"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot.ub\0" \
|
|
"bootscript=echo Running bootscript from mmc...; " \
|
|
"setenv mmcdev 0; " \
|
|
"setenv mmcpart 2; " \
|
|
"run loadbootscript && source ${loadaddr}; \0" \
|
|
"sdboot=echo Booting from SD card ...; " \
|
|
"setenv mmcdev 0; " \
|
|
"setenv mmcpart 2; " \
|
|
"setenv root /dev/mmcblk0p3; " \
|
|
"run loadkernel && run loadfdt; \0" \
|
|
"startbootsequence=run bootscript || run sdboot \0" \
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"mmc rescan; " \
|
|
"run startbootsequence; " \
|
|
"setenv cmdline_append console=ttyAMA0,115200; " \
|
|
"setenv bootargs root=${root} rootwait rw ${cmdline_append}; " \
|
|
"bootz ${loadaddr} - ${fdt_addr}; "
|
|
|
|
/* The rest of the configuration is shared */
|
|
#include <configs/mxs.h>
|
|
|
|
#endif /* __CONFIGS_TS4600_H__ */
|