mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-27 05:23:34 +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>
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/*
|
|
* (C) Copyright 2011
|
|
* eInfochips Ltd. <www.einfochips.com>
|
|
* Written-by: Ajay Bhargav <contact@8051projects.net>
|
|
*
|
|
* Based on Aspenite:
|
|
* (C) Copyright 2010
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
* Contributor: Mahavir Jain <mjain@marvell.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_GPLUGD_H
|
|
#define __CONFIG_GPLUGD_H
|
|
|
|
/*
|
|
* High Level Configuration Options
|
|
*/
|
|
#define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */
|
|
#define CONFIG_ARMADA100 1 /* SOC Family Name */
|
|
#define CONFIG_ARMADA168 1 /* SOC Used on this Board */
|
|
#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
|
|
|
#define CONFIG_SYS_TEXT_BASE 0x00f00000
|
|
|
|
/*
|
|
* There is no internal RAM in ARMADA100, using DRAM
|
|
* TBD: dcache to be used for this
|
|
*/
|
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000)
|
|
#define CONFIG_NR_DRAM_BANKS_MAX 2
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
|
|
/* Disable DCACHE */
|
|
#define CONFIG_SYS_DCACHE_OFF
|
|
|
|
/* Network configuration */
|
|
#ifdef CONFIG_CMD_NET
|
|
#define CONFIG_ARMADA100_FEC
|
|
|
|
/* DHCP Support */
|
|
#define CONFIG_BOOTP_DHCP_REQUEST_DELAY 50000
|
|
#endif /* CONFIG_CMD_NET */
|
|
|
|
/* GPIO Support */
|
|
#define CONFIG_MARVELL_GPIO
|
|
|
|
/* PHY configuration */
|
|
#define CONFIG_MII
|
|
#define CONFIG_RESET_PHY_R
|
|
/* 88E3015 register definition */
|
|
#define PHY_LED_PAR_SEL_REG 22
|
|
#define PHY_LED_MAN_REG 25
|
|
#define PHY_LED_VAL 0x5b /* LINK LED1, ACT LED2 */
|
|
/* GPIO Configuration for PHY */
|
|
#define CONFIG_SYS_GPIO_PHY_RST 104 /* GPIO104 */
|
|
|
|
/* Flash Support */
|
|
|
|
/*
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-common.h"
|
|
|
|
#ifdef CONFIG_SYS_NS16550_COM1
|
|
#undef CONFIG_SYS_NS16550_COM1
|
|
#endif /* CONFIG_SYS_NS16550_COM1 */
|
|
|
|
#define CONFIG_SYS_NS16550_COM1 ARMD1_UART3_BASE
|
|
|
|
/*
|
|
* Environment variables configurations
|
|
*/
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
#define CONFIG_ENV_SIZE 0x4000
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
#define CONFIG_USB_EHCI
|
|
#define CONFIG_USB_EHCI_ARMADA100
|
|
#define CONFIG_EHCI_IS_TDI
|
|
#endif /* CONFIG_CMD_USB */
|
|
|
|
#define CONFIG_SUPPORT_VFAT
|
|
|
|
#endif /* __CONFIG_GPLUGD_H */
|