mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 17:58: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>
113 lines
3 KiB
C
113 lines
3 KiB
C
/*
|
|
* (C) Copyright 2009
|
|
* Net Insight <www.netinsight.net>
|
|
* Written-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
|
|
*
|
|
* Based on sheevaplug.h:
|
|
* (C) Copyright 2009
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _CONFIG_OPENRD_H
|
|
#define _CONFIG_OPENRD_H
|
|
|
|
/*
|
|
* High Level Configuration Options (easy to change)
|
|
*/
|
|
#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
|
|
#define CONFIG_KW88F6281 1 /* SOC Name */
|
|
#define CONFIG_MACH_OPENRD_BASE /* Machine type */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
|
#define CONFIG_SYS_THUMB_BUILD
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
#define CONFIG_SYS_MVFS
|
|
#define CONFIG_CMD_ENV
|
|
#define CONFIG_CMD_NAND
|
|
#define CONFIG_CMD_IDE
|
|
|
|
/*
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-common.h"
|
|
|
|
/*
|
|
* Environment variables configurations
|
|
*/
|
|
#ifdef CONFIG_CMD_NAND
|
|
#define CONFIG_ENV_IS_IN_NAND 1
|
|
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
|
|
#else
|
|
#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
|
|
#endif
|
|
/*
|
|
* max 4k env size is enough, but in case of nand
|
|
* it has to be rounded to sector size
|
|
*/
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
|
#define CONFIG_ENV_ADDR 0x60000
|
|
#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
|
|
/*
|
|
* Environment is right behind U-Boot in flash. Make sure U-Boot
|
|
* doesn't grow into the environment area.
|
|
*/
|
|
#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
|
|
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
|
|
"${x_bootcmd_usb}; bootm 0x6400000;"
|
|
|
|
#define MTDIDS_DEFAULT "nand0=nand_mtd"
|
|
#define MTDPARTS_DEFAULT "mtdparts=nand_mtd:0x100000@0x000000(uboot),"\
|
|
"0x400000@0x100000(uImage),"\
|
|
"0x1fb00000@0x500000(rootfs)"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
|
|
"=ttyS0,115200 "MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
|
|
"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
|
|
"x_bootcmd_usb=usb start\0" \
|
|
"x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0" \
|
|
"mtdids="MTDIDS_DEFAULT"\0" \
|
|
"mtdparts="MTDPARTS_DEFAULT"\0"
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_NET
|
|
# ifdef CONFIG_BOARD_IS_OPENRD_BASE
|
|
# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
|
|
# else
|
|
# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
|
|
# endif
|
|
# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
|
|
# define CONFIG_PHY_BASE_ADR 0x0
|
|
# define PHY_NO "88E1121"
|
|
# else
|
|
# define CONFIG_PHY_BASE_ADR 0x8
|
|
# define PHY_NO "88E1116"
|
|
# endif
|
|
#endif /* CONFIG_CMD_NET */
|
|
|
|
/*
|
|
* 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 /*CONFIG_MVSATA_IDE*/
|
|
|
|
#ifdef CONFIG_CMD_MMC
|
|
#define CONFIG_MVEBU_MMC
|
|
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
|
|
#endif /* CONFIG_CMD_MMC */
|
|
|
|
#endif /* _CONFIG_OPENRD_BASE_H */
|