flash: complete CONFIG_SYS_NO_FLASH move with renaming
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>
This commit is contained in:
committed by
Tom Rini
parent
a931e9975b
commit
e856bdcfb4
@@ -35,7 +35,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
@@ -46,7 +45,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/* High Level Configuration Options */
|
||||
@@ -109,7 +107,7 @@
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
@@ -147,7 +147,6 @@ extern unsigned long get_sdram_size(void);
|
||||
/*
|
||||
* IFC Definitions
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* NAND Flash on IFC */
|
||||
#define CONFIG_SYS_NAND_BASE 0xff800000
|
||||
|
||||
@@ -219,9 +219,6 @@ combinations. this should be removed later
|
||||
*/
|
||||
/* NOR Flash on IFC */
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
#define CONFIG_SYS_FLASH_BASE 0x88000000
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* Max number of sector: 32M */
|
||||
|
||||
@@ -570,7 +567,7 @@ combinations. this should be removed later
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -150,10 +150,6 @@
|
||||
(0xf00000000ull | CONFIG_SYS_PLATFORM_SRAM_BASE)
|
||||
#define CONFIG_SYS_PLATFORM_SRAM_SIZE (512 << 10)
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/*
|
||||
* IFC Definitions
|
||||
*/
|
||||
|
||||
@@ -277,14 +277,12 @@
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
*/
|
||||
#if !defined(CONFIG_SERIAL_BOOT) /*MRAM boot*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_IS_IN_MRAM 1
|
||||
#define CONFIG_ENV_ADDR (0x40000 - 0x1000) /*MRAM size 40000*/
|
||||
#define CONFIG_ENV_SIZE 0x1000
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CF_SBF)
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_IS_IN_SPI_FLASH 1
|
||||
#define CONFIG_ENV_SPI_CS 1
|
||||
#define CONFIG_ENV_OFFSET 0x40000
|
||||
@@ -292,7 +290,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#endif
|
||||
#if defined(CONFIG_SYS_NAND_BOOT)
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#define CONFIG_ENV_OFFSET 0x80000
|
||||
#define CONFIG_ENV_SIZE 0x20000
|
||||
|
||||
@@ -429,7 +429,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -301,7 +301,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -385,7 +385,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -444,7 +444,6 @@
|
||||
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
|
||||
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -460,7 +460,6 @@ boards, we say we have two, but don't display a message if we find only one. */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH /* Flash is not usable now */
|
||||
#undef CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
|
||||
@@ -450,7 +450,6 @@ extern int board_pci_host_broken(void);
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -462,7 +462,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -296,7 +296,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -337,7 +337,6 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
|
||||
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -303,9 +303,6 @@ extern unsigned long get_sdram_size(void);
|
||||
* IFC Definitions
|
||||
*/
|
||||
/* NOR Flash on IFC */
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_FLASH_BASE 0xee000000
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* 32M */
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/* High Level Configuration Options */
|
||||
@@ -56,7 +55,7 @@
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#if !defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
@@ -44,7 +44,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NAND
|
||||
@@ -97,7 +96,7 @@
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
@@ -144,7 +143,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
@@ -762,7 +760,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NAND
|
||||
@@ -112,7 +111,7 @@
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
@@ -159,7 +158,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
@@ -773,7 +771,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#else
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
@@ -71,7 +71,7 @@
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_SYS_EXTRA_ENV_RELOC
|
||||
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
@@ -99,7 +99,7 @@
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
|
||||
#endif
|
||||
#else /* CONFIG_SYS_NO_FLASH */
|
||||
#else /* CONFIG_MTD_NOR_FLASH */
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
|
||||
#endif
|
||||
@@ -640,7 +640,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
#define RESET_VECTOR_OFFSET 0x27FFC
|
||||
#define BOOT_PAGE_OFFSET 0x27000
|
||||
@@ -174,7 +173,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
@@ -825,7 +824,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -51,7 +51,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NAND
|
||||
@@ -115,7 +114,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_TEXT_BASE
|
||||
@@ -137,7 +135,7 @@
|
||||
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
@@ -726,7 +724,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NAND
|
||||
@@ -97,7 +96,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_TEXT_BASE
|
||||
@@ -123,7 +121,7 @@
|
||||
#define CONFIG_SYS_MEMTEST_END 0x00400000
|
||||
#define CONFIG_SYS_ALT_MEMTEST
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
@@ -674,7 +672,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* Dynamic MTD Partition support with mtdparts
|
||||
*/
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#define CONFIG_MTD_DEVICE
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_CMD_MTDPARTS
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -72,7 +71,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#define CONFIG_SRIO_PCIE_BOOT_MASTER
|
||||
@@ -80,7 +78,7 @@
|
||||
|
||||
#include "t4qds.h"
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#define CONFIG_SPL_SKIP_RELOCATE
|
||||
#define CONFIG_SPL_COMMON_INIT_DDR
|
||||
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -325,7 +324,7 @@
|
||||
"setenv bootargs config-addr=0x60000000; " \
|
||||
"bootm 0x01000000 - 0x00f00000"
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#ifndef CONFIG_RAMBOOT_PBL
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
@@ -247,7 +247,6 @@
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#define CONFIG_SPI
|
||||
#define CONFIG_SH_QSPI
|
||||
#define CONFIG_SPI_FLASH_QUAD
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* SH Ether */
|
||||
#define CONFIG_SH_ETHER
|
||||
|
||||
@@ -385,7 +385,6 @@
|
||||
* 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
|
||||
*/
|
||||
#if defined(CONFIG_NOR)
|
||||
#undef CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
#define CONFIG_SYS_FLASH_PROTECTION
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
|
||||
#define CONFIG_CMD_NAND /* NAND support */
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_I2C
|
||||
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
|
||||
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
#define CONFIG_OMAP
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
|
||||
|
||||
/* Common ARM Erratas */
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x80000000
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x81000000
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x8000
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x80000000
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x81000000
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x2000
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
|
||||
@@ -306,8 +306,7 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
/* environment organization */
|
||||
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
/*
|
||||
* Enable the call to miscellaneous platform dependent initialization.
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* SPL
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
|
||||
|
||||
/* U-Boot Commands */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_CMD_DATE
|
||||
#define CONFIG_CMD_NAND
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
#define CONFIG_SYS_TEXT_BASE 0xE80C0000
|
||||
|
||||
/* FLASH */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
/*
|
||||
* mv-common.h should be defined after CMD configs since it used them
|
||||
* to enable certain macros
|
||||
|
||||
@@ -148,9 +148,6 @@
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#endif
|
||||
|
||||
/* NOR flash - no real flash on this board */
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
|
||||
/* Ethernet */
|
||||
#define CONFIG_MACB 1
|
||||
#define CONFIG_RMII 1
|
||||
|
||||
@@ -110,9 +110,6 @@
|
||||
|
||||
#endif
|
||||
|
||||
/* NOR flash - no real flash on this board */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* Ethernet */
|
||||
#define CONFIG_DRIVER_DM9000
|
||||
#define CONFIG_DM9000_BASE 0x30000000
|
||||
|
||||
@@ -234,9 +234,6 @@
|
||||
AT91_WDT_MR_WDD(0xfff))
|
||||
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
#endif
|
||||
|
||||
/* NAND flash */
|
||||
|
||||
@@ -68,8 +68,6 @@
|
||||
* Command line configuration.
|
||||
*/
|
||||
|
||||
/* No NOR flash */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_CMD_NAND
|
||||
|
||||
/* SDRAM */
|
||||
|
||||
@@ -56,9 +56,6 @@
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_HOSTNAME
|
||||
|
||||
/* NOR flash - no real flash on this board */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
|
||||
@@ -84,9 +84,6 @@
|
||||
#define DATAFLASH_TCSS (0x1a << 16)
|
||||
#define DATAFLASH_TCHS (0x1 << 24)
|
||||
|
||||
/* NOR flash - not present */
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
|
||||
/* NAND flash */
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
#define CONFIG_NAND_ATMEL
|
||||
|
||||
@@ -52,9 +52,6 @@
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_HOSTNAME
|
||||
|
||||
/* no NOR flash */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
/*
|
||||
* NAND Flash configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_NAND_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x16000)
|
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||
|
||||
|
||||
@@ -549,7 +549,6 @@ DEFAULT_LINUX_BOOT_ENV \
|
||||
* 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
|
||||
*/
|
||||
#if defined(CONFIG_NOR)
|
||||
#undef CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
#define CONFIG_SYS_FLASH_PROTECTION
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
|
||||
@@ -89,8 +89,6 @@
|
||||
#define CONFIG_ENV_OFFSET (0x00011a00 * 512)
|
||||
#define CONFIG_ENV_SIZE (8 * 512)
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
|
||||
|
||||
/* console configuration */
|
||||
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
||||
|
||||
@@ -88,8 +88,6 @@
|
||||
#define CONFIG_ENV_OFFSET (0x00011a00 * 512)
|
||||
#define CONFIG_ENV_SIZE (8 * 512)
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
|
||||
|
||||
/* console configuration */
|
||||
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
||||
|
||||
@@ -51,8 +51,6 @@
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
|
||||
|
||||
/* console configuration */
|
||||
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 71
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* SPI Settings
|
||||
|
||||
@@ -62,9 +62,6 @@
|
||||
#define CONFIG_SYS_MONITOR_LEN (320 * 1024)
|
||||
#define CONFIG_SYS_MALLOC_LEN (320 * 1024)
|
||||
|
||||
/* We don't have a parallel flash chip */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* support for serial flash */
|
||||
#define CONFIG_BFIN_SPI
|
||||
#define CONFIG_SF_DEFAULT_HZ 30000000
|
||||
|
||||
@@ -83,12 +83,6 @@
|
||||
#define CONFIG_SYS_AUTOLOAD "no"
|
||||
#define CONFIG_ROOTPATH "/romfs"
|
||||
|
||||
/*
|
||||
* Flash Settings
|
||||
*/
|
||||
/* We don't have a parallel flash chip there */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* SPI Settings
|
||||
*/
|
||||
|
||||
@@ -83,12 +83,6 @@
|
||||
#define CONFIG_SYS_AUTOLOAD "no"
|
||||
#define CONFIG_ROOTPATH "/romfs"
|
||||
|
||||
/*
|
||||
* Flash Settings
|
||||
*/
|
||||
/* We don't have a parallel flash chip there */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* SPI Settings
|
||||
*/
|
||||
|
||||
@@ -85,11 +85,6 @@
|
||||
|
||||
#define CONFIG_HOSTNAME bf561-acvilon
|
||||
|
||||
/*
|
||||
* Flash Settings
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/*
|
||||
* I2C Settings
|
||||
*/
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
# if defined(CONFIG_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT)
|
||||
# define CONFIG_SOFT_I2C_READ_REPEATED_START
|
||||
# endif
|
||||
# ifndef CONFIG_SYS_NO_FLASH
|
||||
# ifdef CONFIG_MTD_NOR_FLASH
|
||||
# define CONFIG_CMD_JFFS2
|
||||
# endif
|
||||
# ifdef CONFIG_CMD_JFFS2
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#define CONFIG_MX28 /* i.MX28 SoC */
|
||||
|
||||
/* U-Boot Commands */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_CMD_NAND
|
||||
#define CONFIG_CMD_NAND_TRIMFFS
|
||||
|
||||
@@ -214,11 +214,6 @@
|
||||
#define CONFIG_EBIU_SDRRC_VAL 0x268
|
||||
#define CONFIG_EBIU_SDGCTL_VAL 0x911109
|
||||
|
||||
/* Even though Rev C boards have Parallel Flash
|
||||
* We aren't supporting it. Newer versions of the
|
||||
* hardware don't support Parallel Flash at all.
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#undef CONFIG_CMD_JFFS2
|
||||
|
||||
#endif
|
||||
|
||||
@@ -218,10 +218,6 @@
|
||||
# define CONFIG_SYS_I2C_SLAVE 0xFE
|
||||
#endif
|
||||
|
||||
/*
|
||||
* No Parallel Flash on this board
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#undef CONFIG_CMD_JFFS2
|
||||
|
||||
#endif
|
||||
|
||||
@@ -39,8 +39,7 @@
|
||||
#undef CONFIG_SYS_LOADS_BAUD_CHANGE
|
||||
|
||||
/* FLASH */
|
||||
/* #define CONFIG_SYS_NO_FLASH */ /* uncomment if use QSPI-FLASH */
|
||||
#if defined(CONFIG_SYS_NO_FLASH)
|
||||
#if !defined(CONFIG_MTD_NOR_FLASH)
|
||||
#define CONFIG_SYS_TEXT_BASE 0x40000000
|
||||
#define CONFIG_SPI
|
||||
#define CONFIG_SH_QSPI
|
||||
@@ -80,7 +79,7 @@
|
||||
#define CONFIG_SYS_TMU_CLK_DIV 4
|
||||
|
||||
/* ENV setting */
|
||||
#if defined(CONFIG_SYS_NO_FLASH)
|
||||
#if !defined(CONFIG_MTD_NOR_FLASH)
|
||||
#else
|
||||
#undef CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
#undef CONFIG_ENV_ADDR
|
||||
|
||||
@@ -66,11 +66,6 @@
|
||||
#define CONFIG_HOSTNAME br4
|
||||
#define CONFIG_TFTP_BLOCKSIZE 4404
|
||||
|
||||
/*
|
||||
* Flash Settings
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* We have no parallel FLASH */
|
||||
|
||||
/*
|
||||
* SPI Settings
|
||||
*/
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* enable 32kHz OSC at bootime */
|
||||
#define CONFIG_POWER_TPS65217
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH /* have no NOR-flash */
|
||||
|
||||
#include <asm/arch/omap.h>
|
||||
|
||||
/* NS16550 Configuration */
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_PCI
|
||||
|
||||
|
||||
@@ -102,7 +102,6 @@
|
||||
|
||||
#define CONFIG_CMD_NAND /* NAND support */
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_I2C
|
||||
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
|
||||
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
|
||||
|
||||
@@ -111,7 +111,6 @@
|
||||
|
||||
#define CONFIG_CMD_NAND /* NAND support */
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_I2C
|
||||
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
|
||||
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
|
||||
|
||||
@@ -274,9 +274,7 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* environment organization */
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
|
||||
#define CONFIG_ENV_IS_IN_MMC
|
||||
|
||||
@@ -151,8 +151,7 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
/* environment organization */
|
||||
#define CONFIG_ENV_IS_IN_NAND
|
||||
|
||||
#if defined(CONFIG_ENV_IS_IN_MMC)
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
|
||||
#else /* No flash */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
|
||||
@@ -174,7 +174,6 @@
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* Environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#ifdef CONFIG_ENV_IS_IN_MMC
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
@@ -188,8 +187,6 @@
|
||||
#define CONFIG_ENV_OFFSET (12 * 64 * 2048)
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* USB Host Support */
|
||||
#define CONFIG_USB_EHCI
|
||||
#define CONFIG_USB_EHCI_VF
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
#define CONFIG_CONTROLCENTERD
|
||||
#define CONFIG_MP /* support multiple processors */
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENABLE_36BIT_PHYS
|
||||
|
||||
#ifdef CONFIG_PHYS_64BIT
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
|
||||
(0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
|
||||
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/* High Level Configuration Options */
|
||||
@@ -67,7 +66,7 @@
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#ifdef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_MTD_NOR_FLASH
|
||||
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#endif
|
||||
|
||||
@@ -74,9 +74,6 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE)
|
||||
|
||||
/* No NOR flash */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* NAND flash */
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
#define CONFIG_NAND_ATMEL
|
||||
|
||||
@@ -56,8 +56,6 @@
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#if defined(CONFIG_SDCARD)
|
||||
#define CONFIG_SYS_EXTRA_ENV_RELOC
|
||||
#define CONFIG_ENV_IS_IN_MMC
|
||||
|
||||
@@ -165,7 +165,6 @@
|
||||
#ifdef CONFIG_USE_NAND
|
||||
#undef CONFIG_ENV_IS_IN_FLASH
|
||||
#define CONFIG_NAND_DAVINCI
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
||||
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
||||
#define CONFIG_ENV_SIZE (128 << 10)
|
||||
@@ -242,7 +241,6 @@
|
||||
#define CONFIG_ENV_SIZE (64 << 10)
|
||||
#define CONFIG_ENV_OFFSET (512 << 10)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 << 10)
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -305,7 +303,6 @@
|
||||
!defined(CONFIG_USE_NOR) && \
|
||||
!defined(CONFIG_USE_SPIFLASH)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_SIZE (16 << 10)
|
||||
#undef CONFIG_CMD_ENV
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
|
||||
/* I2C */
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_PCI
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_PCI
|
||||
#define CONFIG_SCSI
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_NAND
|
||||
#define CONFIG_CMD_PCI
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_NAND
|
||||
#define CONFIG_CMD_IDE
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_NAND
|
||||
/*
|
||||
|
||||
@@ -232,7 +232,6 @@
|
||||
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
|
||||
#define CONFIG_SYS_FLASH_SIZE (64 * 1024 * 1024) /* 64 MB */
|
||||
/* #define CONFIG_INIT_IGNORE_ERROR */
|
||||
#undef CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
|
||||
#define CONFIG_SYS_FLASH_PROTECTION
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
|
||||
@@ -120,7 +120,6 @@ REFLASH(dragonboard/u-boot.img, 8)\
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M)
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
#define CONFIG_CMD_ENV
|
||||
|
||||
/* I2C */
|
||||
|
||||
@@ -95,7 +95,6 @@
|
||||
#define CONFIG_ENV_SIZE (8 << 10)
|
||||
#define CONFIG_ENV_OFFSET 0x80000
|
||||
#define CONFIG_ENV_SECT_SIZE (64 << 10)
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_VIDEO)
|
||||
@@ -173,7 +172,6 @@
|
||||
!defined(CONFIG_USE_NOR) && \
|
||||
!defined(CONFIG_USE_SPIFLASH)
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_ENV_SIZE (16 << 10)
|
||||
#undef CONFIG_CMD_ENV
|
||||
#endif
|
||||
|
||||
@@ -115,8 +115,7 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
/* environment organization */
|
||||
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
|
||||
|
||||
@@ -53,9 +53,6 @@
|
||||
/* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#include <config_distro_defaults.h>
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
/* select serial console configuration */
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* Timer input clock frequency */
|
||||
#define COUNTER_FREQUENCY 24000000
|
||||
|
||||
|
||||
@@ -276,9 +276,7 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
/* environment organization */
|
||||
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_NAND
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#define CONFIG_SCIF_CONSOLE
|
||||
|
||||
/* FLASH */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#define CONFIG_SPI
|
||||
#define CONFIG_SH_QSPI
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
|
||||
|
||||
/* Disable DCACHE */
|
||||
#define CONFIG_SYS_DCACHE_OFF
|
||||
|
||||
@@ -163,7 +163,6 @@
|
||||
* 0xFF000000 for 16 MB
|
||||
* 0xFF800000 for 8 MB
|
||||
*/
|
||||
/*#define CONFIG_SYS_NO_FLASH 1*/
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
#define CONFIG_SYS_FLASH_SIZE 0x00800000
|
||||
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
* 0xFF000000 for 16 MB
|
||||
* 0xFF800000 for 8 MB
|
||||
*/
|
||||
/*#define CONFIG_SYS_NO_FLASH 1*/
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
#define CONFIG_SYS_FLASH_SIZE 0x00400000 /* FPGA Bit file is in top of FLASH, we only ues the bottom 4Mb */
|
||||
|
||||
|
||||
@@ -127,7 +127,6 @@
|
||||
* 0xFF000000 for 16 MB
|
||||
* 0xFF800000 for 8 MB
|
||||
*/
|
||||
/*#define CONFIG_SYS_NO_FLASH 1*/
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
#define CONFIG_SYS_FLASH_SIZE 0x00800000
|
||||
|
||||
|
||||
@@ -139,7 +139,6 @@
|
||||
* 0xFF000000 for 16 MB
|
||||
* 0xFF800000 for 8 MB
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
#define CONFIG_SYS_FLASH_SIZE 0x00800000
|
||||
#define CONFIG_ENV_SIZE 0x8000
|
||||
|
||||
@@ -134,7 +134,6 @@
|
||||
* 0xFF000000 for 16 MB
|
||||
* 0xFF800000 for 8 MB
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
#define CONFIG_SYS_FLASH_BASE 0x00000000
|
||||
#define CONFIG_SYS_FLASH_SIZE 0x00800000
|
||||
#define CONFIG_ENV_SIZE 0x8000
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
#define CONFIG_CPU_PXA25X 1
|
||||
#define CONFIG_BOARD_H2200
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
#define CONFIG_SYS_DCACHE_OFF
|
||||
#define CONFIG_SYS_THUMB_BUILD
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#define CONFIG_SYS_BOOTMAPSZ (16 << 20)
|
||||
|
||||
#define CONFIG_SYS_TIMER_RATE (150000000/256)
|
||||
|
||||
@@ -127,6 +127,4 @@
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
#define CONFIG_SYS_MAXARGS 64 /* max command args */
|
||||
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
|
||||
#endif /* __HIKEY_H */
|
||||
|
||||
@@ -217,8 +217,6 @@
|
||||
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
|
||||
#define CONFIG_FLASH_CFI_LEGACY
|
||||
#define CONFIG_SYS_FLASH_LEGACY_512Kx16
|
||||
#else
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
|
||||
#define CONFIG_SYS_MVFS
|
||||
#define CONFIG_CMD_IDE
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
|
||||
#define CONFIG_SYS_MVFS
|
||||
#define CONFIG_CMD_ENV
|
||||
#define CONFIG_CMD_NAND
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user