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>
198 lines
5.2 KiB
C
198 lines
5.2 KiB
C
/*
|
|
* Copyright (c) 2011 The Chromium OS Authors.
|
|
* (C) Copyright 2008
|
|
* Graeme Russ, graeme.russ@gmail.com.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <asm/ibmpc.h>
|
|
|
|
#ifndef __CONFIG_X86_COMMON_H
|
|
#define __CONFIG_X86_COMMON_H
|
|
|
|
/*
|
|
* High Level Configuration Options
|
|
* (easy to change)
|
|
*/
|
|
#define CONFIG_SHOW_BOOT_PROGRESS
|
|
#define CONFIG_ZBOOT_32
|
|
#define CONFIG_PHYSMEM
|
|
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
|
#define CONFIG_LAST_STAGE_INIT
|
|
#define CONFIG_NR_DRAM_BANKS 8
|
|
|
|
#define CONFIG_LMB
|
|
|
|
#define CONFIG_LZO
|
|
#undef CONFIG_ZLIB
|
|
#undef CONFIG_GZIP
|
|
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
|
|
|
|
/* SATA AHCI storage */
|
|
|
|
#define CONFIG_SCSI_AHCI
|
|
#ifdef CONFIG_SCSI_AHCI
|
|
#define CONFIG_LIBATA
|
|
#define CONFIG_LBA48
|
|
#define CONFIG_SYS_64BIT_LBA
|
|
|
|
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
|
|
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
|
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
|
|
CONFIG_SYS_SCSI_MAX_LUN)
|
|
#endif
|
|
|
|
/* Generic TPM interfaced through LPC bus */
|
|
#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* Real Time Clock Configuration
|
|
*/
|
|
#define CONFIG_RTC_MC146818
|
|
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
|
|
#define CONFIG_SYS_ISA_IO CONFIG_SYS_ISA_IO_BASE_ADDRESS
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* Serial Configuration
|
|
*/
|
|
#define CONFIG_BAUDRATE 115200
|
|
#define CONFIG_SYS_BAUDRATE_TABLE {300, 600, 1200, 2400, 4800, \
|
|
9600, 19200, 38400, 115200}
|
|
#define CONFIG_SYS_NS16550_PORT_MAPPED
|
|
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_COMMAND_HISTORY
|
|
#define CONFIG_AUTO_COMPLETE
|
|
|
|
#define CONFIG_SUPPORT_VFAT
|
|
|
|
#ifdef CONFIG_SYS_COREBOOT
|
|
#define CONFIG_CMD_CBFS
|
|
#endif
|
|
|
|
/* x86 GPIOs are accessed through a PCI device */
|
|
#define CONFIG_INTEL_ICH6_GPIO
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* Command line configuration.
|
|
*/
|
|
#define CONFIG_CMD_DATE
|
|
#define CONFIG_CMD_FPGA_LOADMK
|
|
#define CONFIG_CMD_IO
|
|
#define CONFIG_CMD_IRQ
|
|
#define CONFIG_CMD_PCI
|
|
#define CONFIG_CMD_GETTIME
|
|
#define CONFIG_SCSI
|
|
|
|
#define CONFIG_CMD_ZBOOT
|
|
|
|
#define CONFIG_BOOTARGS \
|
|
"root=/dev/sdb3 init=/sbin/init rootwait ro"
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"
|
|
|
|
#if defined(CONFIG_CMD_KGDB)
|
|
#define CONFIG_KGDB_BAUDRATE 115200
|
|
#endif
|
|
|
|
/*
|
|
* Miscellaneous configurable options
|
|
*/
|
|
#define CONFIG_SYS_LONGHELP
|
|
#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
|
|
|
|
#define CONFIG_SYS_MEMTEST_START 0x00100000
|
|
#define CONFIG_SYS_MEMTEST_END 0x01000000
|
|
#define CONFIG_SYS_LOAD_ADDR 0x20000000
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* CPU Features
|
|
*/
|
|
|
|
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
|
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
|
|
#define CONFIG_SYS_MALLOC_LEN 0x200000
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* FLASH configuration
|
|
*/
|
|
#define CONFIG_CMD_SF_TEST
|
|
#define CONFIG_SPI
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* Environment configuration
|
|
*/
|
|
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
|
#define CONFIG_ENV_SIZE 0x01000
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* PCI configuration
|
|
*/
|
|
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* USB configuration
|
|
*/
|
|
#define CONFIG_USB_EHCI
|
|
#define CONFIG_USB_EHCI_PCI
|
|
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
#define CONFIG_SYS_USB_EVENT_POLL
|
|
|
|
#define CONFIG_USB_HOST_ETHER
|
|
#define CONFIG_USB_ETHER_ASIX
|
|
#define CONFIG_USB_ETHER_SMSC95XX
|
|
#define CONFIG_TFTP_TSIZE
|
|
#define CONFIG_BOOTP_BOOTFILESIZE
|
|
#define CONFIG_BOOTP_BOOTPATH
|
|
#define CONFIG_BOOTP_GATEWAY
|
|
#define CONFIG_BOOTP_HOSTNAME
|
|
|
|
/* Default environment */
|
|
#define CONFIG_ROOTPATH "/opt/nfsroot"
|
|
#define CONFIG_HOSTNAME x86
|
|
#define CONFIG_BOOTFILE "bzImage"
|
|
#define CONFIG_LOADADDR 0x1000000
|
|
#define CONFIG_RAMDISK_ADDR 0x4000000
|
|
#ifdef CONFIG_GENERATE_ACPI_TABLE
|
|
#define CONFIG_OTHBOOTARGS "othbootargs=\0"
|
|
#else
|
|
#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0"
|
|
#endif
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
CONFIG_STD_DEVICES_SETTINGS \
|
|
"pciconfighost=1\0" \
|
|
"netdev=eth0\0" \
|
|
"consoledev=ttyS0\0" \
|
|
CONFIG_OTHBOOTARGS \
|
|
"ramdiskaddr=0x4000000\0" \
|
|
"ramdiskfile=initramfs.gz\0"
|
|
|
|
#define CONFIG_RAMBOOTCOMMAND \
|
|
"setenv bootargs root=/dev/ram rw " \
|
|
"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
|
|
"console=$consoledev,$baudrate $othbootargs;" \
|
|
"tftpboot $loadaddr $bootfile;" \
|
|
"tftpboot $ramdiskaddr $ramdiskfile;" \
|
|
"zboot $loadaddr 0 $ramdiskaddr $filesize"
|
|
|
|
#define CONFIG_NFSBOOTCOMMAND \
|
|
"setenv bootargs root=/dev/nfs rw " \
|
|
"nfsroot=$serverip:$rootpath " \
|
|
"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
|
|
"console=$consoledev,$baudrate $othbootargs;" \
|
|
"tftpboot $loadaddr $bootfile;" \
|
|
"zboot $loadaddr"
|
|
|
|
|
|
#endif /* __CONFIG_H */
|