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>
119 lines
3.2 KiB
C
119 lines
3.2 KiB
C
/*
|
|
* USB armory MkI board configuration settings
|
|
* http://inversepath.com/usbarmory
|
|
*
|
|
* Copyright (C) 2015, Inverse Path
|
|
* Andrej Rosano <andrej@inversepath.com>
|
|
*
|
|
* SPDX-License-Identifier:|____GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#define CONFIG_MX53
|
|
#define CONFIG_SYS_FSL_CLK
|
|
#define CONFIG_MXC_GPIO
|
|
|
|
#include <asm/arch/imx-regs.h>
|
|
|
|
#include <config_distro_defaults.h>
|
|
|
|
/* U-Boot environment */
|
|
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
|
#define CONFIG_ENV_SIZE (8 * 1024)
|
|
#define CONFIG_ENV_IS_IN_MMC
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
|
/* U-Boot general configurations */
|
|
#define CONFIG_SYS_CBSIZE 512
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
|
|
#define CONFIG_SYS_MAXARGS 16
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
|
|
/* UART */
|
|
#define CONFIG_MXC_UART
|
|
#define CONFIG_MXC_UART_BASE UART1_BASE
|
|
#define CONFIG_CONS_INDEX 1
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* SD/MMC */
|
|
#define CONFIG_FSL_ESDHC
|
|
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
#define CONFIG_SYS_FSL_ESDHC_NUM 1
|
|
|
|
/* USB */
|
|
#define CONFIG_USB_EHCI
|
|
#define CONFIG_USB_EHCI_MX5
|
|
#define CONFIG_MXC_USB_PORT 1
|
|
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
|
#define CONFIG_MXC_USB_FLAGS 0
|
|
|
|
/* I2C */
|
|
#define CONFIG_SYS_I2C
|
|
#define CONFIG_SYS_I2C_MXC
|
|
#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
|
|
#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
|
|
|
|
/* Fuse */
|
|
#define CONFIG_CMD_FUSE
|
|
#define CONFIG_FSL_IIM
|
|
|
|
/* U-Boot memory offsets */
|
|
#define CONFIG_LOADADDR 0x72000000
|
|
#define CONFIG_SYS_TEXT_BASE 0x77800000
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
/* Linux boot */
|
|
#define CONFIG_HOSTNAME usbarmory
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"run distro_bootcmd; " \
|
|
"setenv bootargs console=${console} ${bootargs_default}; " \
|
|
"ext2load mmc 0:1 ${kernel_addr_r} /boot/zImage; " \
|
|
"ext2load mmc 0:1 ${fdt_addr_r} /boot/${fdtfile}; " \
|
|
"bootz ${kernel_addr_r} - ${fdt_addr_r}"
|
|
|
|
#define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
|
"kernel_addr_r=0x70800000\0" \
|
|
"fdt_addr_r=0x71000000\0" \
|
|
"scriptaddr=0x70800000\0" \
|
|
"pxefile_addr_r=0x70800000\0" \
|
|
"ramdisk_addr_r=0x73000000\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
MEM_LAYOUT_ENV_SETTINGS \
|
|
"bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \
|
|
"fdtfile=imx53-usbarmory.dtb\0" \
|
|
"console=ttymxc0,115200\0" \
|
|
BOOTENV
|
|
|
|
#ifndef CONFIG_CMDLINE
|
|
#define CONFIG_BOOTARGS "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw"
|
|
#define USBARMORY_FIT_PATH "/boot/usbarmory.itb"
|
|
#define USBARMORY_FIT_ADDR "0x70800000"
|
|
#endif
|
|
|
|
/* Physical Memory Map */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define PHYS_SDRAM CSD0_BASE_ADDR
|
|
#define PHYS_SDRAM_SIZE (gd->ram_size)
|
|
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
|
|
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
|
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
|
|
|
|
#define CONFIG_SYS_INIT_SP_OFFSET \
|
|
(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
|
|
|
#define CONFIG_SYS_MEMTEST_START 0x70000000
|
|
#define CONFIG_SYS_MEMTEST_END 0x90000000
|
|
|
|
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
|
|
|
|
#endif /* __CONFIG_H */
|