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>
191 lines
5.8 KiB
C
191 lines
5.8 KiB
C
/*
|
|
* (C) Copyright 2012-2016 Stephen Warren
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/timer.h>
|
|
|
|
#if defined(CONFIG_TARGET_RPI_2) || defined(CONFIG_TARGET_RPI_3_32B)
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT
|
|
#endif
|
|
|
|
/* Architecture, CPU, etc.*/
|
|
#define CONFIG_ARCH_CPU_INIT
|
|
|
|
/* Use SoC timer for AArch32, but architected timer for AArch64 */
|
|
#ifndef CONFIG_ARM64
|
|
#define CONFIG_SYS_TIMER_RATE 1000000
|
|
#define CONFIG_SYS_TIMER_COUNTER \
|
|
(&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)
|
|
#endif
|
|
|
|
/*
|
|
* 2835 is a SKU in a series for which the 2708 is the first or primary SoC,
|
|
* so 2708 has historically been used rather than a dedicated 2835 ID.
|
|
*
|
|
* We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation
|
|
* chose to use someone else's previously registered machine ID (3139, MX51_GGC)
|
|
* rather than obtaining a valid ID:-/
|
|
*
|
|
* For the bcm2837, hopefully a machine type is not needed, since everything
|
|
* is DT.
|
|
*/
|
|
#ifdef CONFIG_BCM2835
|
|
#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708
|
|
#endif
|
|
|
|
/* Memory layout */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define CONFIG_SYS_SDRAM_BASE 0x00000000
|
|
#ifdef CONFIG_ARM64
|
|
#define CONFIG_SYS_TEXT_BASE 0x00080000
|
|
#else
|
|
#define CONFIG_SYS_TEXT_BASE 0x00008000
|
|
#endif
|
|
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
|
|
/*
|
|
* The board really has 256M. However, the VC (VideoCore co-processor) shares
|
|
* the RAM, and uses a configurable portion at the top. We tell U-Boot that a
|
|
* smaller amount of RAM is present in order to avoid stomping on the area
|
|
* the VC uses.
|
|
*/
|
|
#define CONFIG_SYS_SDRAM_SIZE SZ_128M
|
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \
|
|
CONFIG_SYS_SDRAM_SIZE - \
|
|
GENERATED_GBL_DATA_SIZE)
|
|
#define CONFIG_SYS_MALLOC_LEN SZ_4M
|
|
#define CONFIG_SYS_MEMTEST_START 0x00100000
|
|
#define CONFIG_SYS_MEMTEST_END 0x00200000
|
|
#define CONFIG_LOADADDR 0x00200000
|
|
|
|
/* Devices */
|
|
/* GPIO */
|
|
#define CONFIG_BCM2835_GPIO
|
|
/* LCD */
|
|
#define CONFIG_LCD_DT_SIMPLEFB
|
|
#define LCD_BPP LCD_COLOR32
|
|
/*
|
|
* Prevent allocation of RAM for FB; the real FB address is queried
|
|
* dynamically from the VideoCore co-processor, and comes from RAM
|
|
* not owned by the ARM CPU.
|
|
*/
|
|
#define CONFIG_FB_ADDR 0
|
|
#define CONFIG_VIDEO_BCM2835
|
|
#define CONFIG_SYS_WHITE_ON_BLACK
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
#define CONFIG_USB_DWC2
|
|
#ifndef CONFIG_BCM2835
|
|
#define CONFIG_USB_DWC2_REG_ADDR 0x3f980000
|
|
#else
|
|
#define CONFIG_USB_DWC2_REG_ADDR 0x20980000
|
|
#endif
|
|
#define CONFIG_USB_HOST_ETHER
|
|
#define CONFIG_USB_ETHER_SMSC95XX
|
|
#define CONFIG_TFTP_TSIZE
|
|
#define CONFIG_MISC_INIT_R
|
|
#define CONFIG_SYS_USB_EVENT_POLL
|
|
#endif
|
|
|
|
/* Console UART */
|
|
#ifdef CONFIG_BCM2837
|
|
#define CONFIG_BCM283X_MU_SERIAL
|
|
#else
|
|
#define CONFIG_PL01X_SERIAL
|
|
#endif
|
|
#define CONFIG_CONS_INDEX 0
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* Console configuration */
|
|
#define CONFIG_SYS_CBSIZE 1024
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
|
sizeof(CONFIG_SYS_PROMPT) + 16)
|
|
|
|
/* Environment */
|
|
#define CONFIG_ENV_SIZE SZ_16K
|
|
#define CONFIG_ENV_IS_IN_FAT
|
|
#define FAT_ENV_INTERFACE "mmc"
|
|
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
|
#define FAT_ENV_FILE "uboot.env"
|
|
#define CONFIG_FAT_WRITE
|
|
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
|
#define CONFIG_SYS_LOAD_ADDR 0x1000000
|
|
#define CONFIG_PREBOOT "usb start"
|
|
|
|
/* Shell */
|
|
#define CONFIG_SYS_MAXARGS 16
|
|
#define CONFIG_COMMAND_HISTORY
|
|
|
|
/* ATAGs support for bootm/bootz */
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_INITRD_TAG
|
|
|
|
#include <config_distro_defaults.h>
|
|
|
|
/* Environment */
|
|
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
|
#define ENV_DEVICE_SETTINGS \
|
|
"stdin=serial,usbkbd\0" \
|
|
"stdout=serial,lcd\0" \
|
|
"stderr=serial,lcd\0"
|
|
|
|
/*
|
|
* Memory layout for where various images get loaded by boot scripts:
|
|
*
|
|
* I suspect address 0 is used as the SMP pen on the RPi2, so avoid this.
|
|
*
|
|
* fdt_addr_r simply shouldn't overlap anything else. However, the RPi's
|
|
* binary firmware loads a DT to address 0x100, so we choose this address to
|
|
* match it. This allows custom boot scripts to pass this DT on to Linux
|
|
* simply by not over-writing the data at this address. When using U-Boot,
|
|
* U-Boot (and scripts it executes) typicaly ignore the DT loaded by the FW
|
|
* and loads its own DT from disk (triggered by boot.scr or extlinux.conf).
|
|
*
|
|
* pxefile_addr_r can be pretty much anywhere that doesn't conflict with
|
|
* something else. Put it low in memory to avoid conflicts.
|
|
*
|
|
* kernel_addr_r must be within the first 128M of RAM in order for the
|
|
* kernel's CONFIG_AUTO_ZRELADDR option to work. Since the kernel will
|
|
* decompress itself to 0x8000 after the start of RAM, kernel_addr_r
|
|
* should not overlap that area, or the kernel will have to copy itself
|
|
* somewhere else before decompression. Similarly, the address of any other
|
|
* data passed to the kernel shouldn't overlap the start of RAM. Pushing
|
|
* this up to 16M allows for a sizable kernel to be decompressed below the
|
|
* compressed load address.
|
|
*
|
|
* scriptaddr can be pretty much anywhere that doesn't conflict with something
|
|
* else. Choosing 32M allows for the compressed kernel to be up to 16M.
|
|
*
|
|
* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows
|
|
* for any boot script to be up to 1M, which is hopefully plenty.
|
|
*/
|
|
#define ENV_MEM_LAYOUT_SETTINGS \
|
|
"fdt_high=ffffffff\0" \
|
|
"initrd_high=ffffffff\0" \
|
|
"fdt_addr_r=0x00000100\0" \
|
|
"pxefile_addr_r=0x00100000\0" \
|
|
"kernel_addr_r=0x01000000\0" \
|
|
"scriptaddr=0x02000000\0" \
|
|
"ramdisk_addr_r=0x02100000\0" \
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 0) \
|
|
func(USB, usb, 0) \
|
|
func(PXE, pxe, na) \
|
|
func(DHCP, dhcp, na)
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \
|
|
ENV_DEVICE_SETTINGS \
|
|
ENV_MEM_LAYOUT_SETTINGS \
|
|
BOOTENV
|
|
|
|
|
|
#endif
|