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>
140 lines
3.3 KiB
C
140 lines
3.3 KiB
C
/*
|
|
* Copyright (C) 2011
|
|
* Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
|
|
*
|
|
* Based on Kirkwood support:
|
|
* (C) Copyright 2009
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _CONFIG_DNS325_H
|
|
#define _CONFIG_DNS325_H
|
|
|
|
/*
|
|
* Machine number definition
|
|
*/
|
|
#define CONFIG_MACH_TYPE MACH_TYPE_DNS325
|
|
|
|
/*
|
|
* High Level Configuration Options (easy to change)
|
|
*/
|
|
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
|
|
#define CONFIG_KW88F6281 /* SOC Name */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
#define CONFIG_CMD_ENV
|
|
#define CONFIG_CMD_NAND
|
|
#define CONFIG_CMD_IDE
|
|
#define CONFIG_CMD_DATE
|
|
#define CONFIG_SYS_MVFS
|
|
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
|
|
/*
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-common.h"
|
|
|
|
/* Remove or override few declarations from mv-common.h */
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_NET
|
|
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
|
|
#define CONFIG_NETCONSOLE
|
|
#endif
|
|
|
|
/*
|
|
* SATA Driver configuration
|
|
*/
|
|
#ifdef CONFIG_MVSATA_IDE
|
|
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
|
|
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
|
|
#endif
|
|
|
|
/*
|
|
* RTC driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_DATE
|
|
#define CONFIG_RTC_MV
|
|
#endif
|
|
|
|
/*
|
|
* Enable GPI0 support
|
|
*/
|
|
#define CONFIG_KIRKWOOD_GPIO
|
|
|
|
/*
|
|
* Environment variables configurations
|
|
*/
|
|
#ifdef CONFIG_CMD_NAND
|
|
#define CONFIG_ENV_IS_IN_NAND
|
|
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128KB */
|
|
#else
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
#endif
|
|
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128KB */
|
|
#define CONFIG_ENV_ADDR 0xe0000
|
|
#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define MTDIDS_DEFAULT "nand0=orion_nand"
|
|
|
|
#define MTDPARTS_DEFAULT "mtdparts=orion_nand:" \
|
|
"896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"stdin=serial\0" \
|
|
"stdout=serial\0" \
|
|
"stderr=serial\0" \
|
|
"loadaddr=0x800000\0" \
|
|
"autoload=no\0" \
|
|
"console=ttyS0,115200\0" \
|
|
"mtdparts="MTDPARTS_DEFAULT \
|
|
"optargs=\0" \
|
|
"bootenv=uEnv.txt\0" \
|
|
"importbootenv=echo Importing environment ...; " \
|
|
"env import -t ${loadaddr} ${filesize}\0" \
|
|
"loadbootenv=fatload usb 0 ${loadaddr} ${bootenv}\0" \
|
|
"setbootargs=setenv bootargs console=${console} " \
|
|
"${optargs} " \
|
|
"${mtdparts} " \
|
|
"root=${bootenvroot} " \
|
|
"rootfstype=${bootenvrootfstype}\0" \
|
|
"subbootcmd=run setbootargs; " \
|
|
"if run bootenvloadimage; then " \
|
|
"bootm ${loadaddr};" \
|
|
"fi;\0" \
|
|
"nandroot=ubi0:rootfs ubi.mtd=rootfs\0" \
|
|
"nandrootfstype=ubifs\0" \
|
|
"nandloadimage=nand read ${loadaddr} kernel\0" \
|
|
"setnandbootenv=echo Booting from nand ...; " \
|
|
"setenv bootenvroot ${nandroot}; " \
|
|
"setenv bootenvrootfstype ${nandrootfstype}; " \
|
|
"setenv bootenvloadimage ${nandloadimage}\0"
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"if test -n ${bootenv} && usb start; then " \
|
|
"if run loadbootenv; then " \
|
|
"echo Loaded environment ${bootenv} from usb;" \
|
|
"run importbootenv;" \
|
|
"fi;" \
|
|
"if test -n ${bootenvcmd}; then " \
|
|
"echo Running bootenvcmd ...;" \
|
|
"run bootenvcmd;" \
|
|
"fi;" \
|
|
"fi;" \
|
|
"run setnandbootenv subbootcmd;"
|
|
|
|
#endif /* _CONFIG_DNS325_H */
|