mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +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>
53 lines
1.4 KiB
C
53 lines
1.4 KiB
C
/*
|
|
* include/configs/salvator-x.h
|
|
* This file is Salvator-X board configuration.
|
|
*
|
|
* Copyright (C) 2015 Renesas Electronics Corporation
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __SALVATOR_X_H
|
|
#define __SALVATOR_X_H
|
|
|
|
#undef DEBUG
|
|
|
|
#define CONFIG_RCAR_BOARD_STRING "Salvator-X"
|
|
|
|
#include "rcar-gen3-common.h"
|
|
|
|
/* SCIF */
|
|
#define CONFIG_SCIF_CONSOLE
|
|
#define CONFIG_CONS_SCIF2
|
|
#define CONFIG_CONS_INDEX 2
|
|
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
|
|
|
|
/* [A] Hyper Flash */
|
|
/* use to RPC(SPI Multi I/O Bus Controller) */
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
|
|
/* Board Clock */
|
|
/* XTAL_CLK : 33.33MHz */
|
|
#define RCAR_XTAL_CLK 33333333u
|
|
#define CONFIG_SYS_CLK_FREQ RCAR_XTAL_CLK
|
|
/* ch0to2 CPclk, ch3to11 S3D2_PEREclk, ch12to14 S3D2_RTclk */
|
|
/* CPclk 16.66MHz, S3D2 133.33MHz */
|
|
#define CONFIG_CP_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
|
|
#define CONFIG_PLL1_CLK_FREQ (CONFIG_SYS_CLK_FREQ * 192 / 2)
|
|
#define CONFIG_S3D2_CLK_FREQ (266666666u/2)
|
|
|
|
/* Generic Timer Definitions (use in assembler source) */
|
|
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
|
|
|
|
/* Generic Interrupt Controller Definitions */
|
|
#define CONFIG_GICV2
|
|
#define GICD_BASE 0xF1010000
|
|
#define GICC_BASE 0xF1020000
|
|
|
|
/* Module stop status bits */
|
|
/* MFIS, SCIF1 */
|
|
#define CONFIG_SMSTP2_ENA 0x00002040
|
|
/* INTC-AP, IRQC */
|
|
#define CONFIG_SMSTP4_ENA 0x00000180
|
|
|
|
#endif /* __SALVATOR_X_H */
|