diff options
Diffstat (limited to 'include')
77 files changed, 244 insertions, 255 deletions
diff --git a/include/clk.h b/include/clk.h index dc18b03..94c0037 100644 --- a/include/clk.h +++ b/include/clk.h @@ -10,6 +10,7 @@ #define _CLK_H_ #include <linux/types.h> +#include <asm/errno.h> /** * A clock is a hardware signal that oscillates autonomously at a specific @@ -59,7 +60,7 @@ struct clk { unsigned long id; }; -#if CONFIG_IS_ENABLED(OF_CONTROL) +#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK) struct phandle_2_cell; int clk_get_by_index_platdata(struct udevice *dev, int index, struct phandle_2_cell *cells, struct clk *clk); diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 5da0005..bf75209 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -17,7 +17,6 @@ * (easy to change) ***********************************************************/ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ -#define CONFIG_MIP405 1 /* ...on a MIP405 board */ #define CONFIG_SYS_TEXT_BASE 0xFFF80000 @@ -57,9 +56,6 @@ #define CONFIG_CMD_SAVES #define CONFIG_CMD_BSP -#if !defined(CONFIG_MIP405T) -#endif - /************************************************************** * I2C Stuff: * the MIP405 is equiped with an Atmel 24C128/256 EEPROM at address @@ -312,7 +308,7 @@ /************************************************************ * IDE/ATA stuff ************************************************************/ -#if defined(CONFIG_MIP405T) +#if defined(CONFIG_TARGET_MIP405T) #define CONFIG_SYS_IDE_MAXBUS 1 /* MIP405T has only one IDE bus */ #else #define CONFIG_SYS_IDE_MAXBUS 2 /* max. 2 IDE busses */ @@ -358,7 +354,7 @@ /************************************************************ * USB support EXPERIMENTAL ************************************************************/ -#if !defined(CONFIG_MIP405T) +#if !defined(CONFIG_TARGET_MIP405T) #define CONFIG_USB_UHCI #define CONFIG_USB_KEYBOARD @@ -377,21 +373,4 @@ ************************************************************/ #define CONFIG_BZIP2 1 -/************************************************************ - * Ident - ************************************************************/ - -#define VERSION_TAG "released" -#if !defined(CONFIG_MIP405T) -#define CONFIG_ISO_STRING "MEV-10072-001" -#else -#define CONFIG_ISO_STRING "MEV-10082-001" -#endif - -#if !defined(CONFIG_BOOT_PCI) -#define CONFIG_IDENT_STRING "\n(c) 2003 by MPL AG Switzerland, " CONFIG_ISO_STRING " " VERSION_TAG -#else -#define CONFIG_IDENT_STRING "\n(c) 2003 by MPL AG Switzerland, PCI_BOOT Version" -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/PATI.h b/include/configs/PATI.h index e96fbc5..ebabdff 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -252,9 +252,4 @@ */ #define CONFIG_SYS_DER 0x00000000 -#define VERSION_TAG "released" -#define CONFIG_ISO_STRING "MEV-10084-001" - -#define CONFIG_IDENT_STRING "\n(c) 2003 by MPL AG Switzerland, " CONFIG_ISO_STRING " " VERSION_TAG - #endif /* __CONFIG_H */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index ecb126b..7d08f0c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -333,11 +333,4 @@ ************************************************************/ #define CONFIG_BZIP2 1 -/************************************************************ - * Ident - ************************************************************/ -#define VERSION_TAG "released" -#define CONFIG_ISO_STRING "MEV-10066-001" -#define CONFIG_IDENT_STRING "\n(c) 2002 by MPL AG Switzerland, " CONFIG_ISO_STRING " " VERSION_TAG - #endif /* __CONFIG_H */ diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index c5a7d68..a368d81 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -151,12 +151,6 @@ #define CONFIG_LZO #define CONFIG_LZMA -/* Ident */ -/*#define VERSION_TAG "released"*/ -#define VERSION_TAG "unstable" -#define CONFIG_IDENT_STRING "\n(c) 2003 - 2011 by MPL AG Switzerland, " \ - "MEV-10080-001 " VERSION_TAG - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x30000000 /* SDRAM Bank #1 */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 136e3a6..e100b51 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -11,7 +11,6 @@ #define __CONFIG_H #define CONFIG_ENV_VERSION 10 -#define CONFIG_IDENT_STRING " apf27 patch 3.10" #define CONFIG_BOARD_NAME apf27 /* diff --git a/include/configs/arndale.h b/include/configs/arndale.h index b08f341..74fd9c4 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -27,8 +27,6 @@ /* Miscellaneous configurable options */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" -#define CONFIG_IDENT_STRING " for ARNDALE" - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE) diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index c468484..0cc72ca 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -11,11 +11,6 @@ #define __CONFIG_ASPENITE_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nMarvell-Aspenite DB" - -/* * High Level Configuration Options */ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ diff --git a/include/configs/boston.h b/include/configs/boston.h new file mode 100644 index 0000000..e958054 --- /dev/null +++ b/include/configs/boston.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2016 Imagination Technologies + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef __CONFIGS_BOSTON_H__ +#define __CONFIGS_BOSTON_H__ + +/* + * General board configuration + */ +#define CONFIG_DISPLAY_BOARDINFO + +/* + * CPU + */ +#define CONFIG_SYS_MIPS_TIMER_FREQ 30000000 + +/* + * PCI + */ +#define CONFIG_PCI +#define CONFIG_PCI_PNP +#define CONFIG_CMD_PCI + +/* + * Memory map + */ +#ifdef CONFIG_64BIT +# define CONFIG_SYS_SDRAM_BASE 0xffffffff80000000 +#else +# define CONFIG_SYS_SDRAM_BASE 0x80000000 +#endif + +#define CONFIG_SYS_INIT_SP_OFFSET 0x400000 + +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE + +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100000) + +#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + 0) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x10000000) + +#define CONFIG_SYS_MALLOC_LEN (256 * 1024) + +/* + * Console + */ +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP +#define CONFIG_BAUDRATE 115200 + +/* + * Flash + */ +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_FLASH_PROTECTION +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_SECT 1024 + +/* + * Environment + */ +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#ifdef CONFIG_64BIT +# define CONFIG_ENV_ADDR \ + (0xffffffffb8000000 + (128 << 20) - CONFIG_ENV_SIZE) +#else +# define CONFIG_ENV_ADDR \ + (0xb8000000 + (128 << 20) - CONFIG_ENV_SIZE) +#endif + +#endif /* __CONFIGS_BOSTON_H__ */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 29189a4..fbe9c82 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -45,12 +45,6 @@ #define CONFIG_ENABLE_36BIT_PHYS #define CONFIG_FSL_LAW /* Use common FSL init code */ -#ifdef CONFIG_TRAILBLAZER -#define CONFIG_IDENT_STRING " controlcenterd trailblazer 0.01" -#else -#define CONFIG_IDENT_STRING " controlcenterd 0.01" -#endif - #ifdef CONFIG_PHYS_64BIT #define CONFIG_ADDR_MAP #define CONFIG_SYS_NUM_ADDR_MAP 16 /* number of TLB1 entries */ diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 521604e..a5384a2 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -17,7 +17,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME dlvsion-10g -#define CONFIG_IDENT_STRING " dlvision-10g 0.06" #include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 4dda319..57640da 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -17,7 +17,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME dlvision -#define CONFIG_IDENT_STRING " dlvision 0.02" #include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 7ee274e..23c173e 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -18,7 +18,6 @@ */ #define MACH_TYPE_DNS325 3800 #define CONFIG_MACH_TYPE MACH_TYPE_DNS325 -#define CONFIG_IDENT_STRING "\nD-Link DNS-325" /* * High Level Configuration Options (easy to change) diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index cd05857..b526620 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -13,11 +13,6 @@ #define _CONFIG_DOCKSTAR_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nSeagate FreeAgent DockStar" - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index cc7ab83..1b440ea 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -12,8 +12,6 @@ #include <linux/sizes.h> #include <asm/arch/sysmap-apq8016.h> -#define CONFIG_IDENT_STRING "\nQualcomm-DragonBoard 410C" - #define CONFIG_MISC_INIT_R /* To stop autoboot */ /* Physical Memory Map */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index c78c949..252e5f5 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -26,11 +26,6 @@ #endif /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nMarvell-DreamPlug" - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 1e2807d..982d526 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -31,12 +31,6 @@ #define CONFIG_SYS_TEXT_BASE 0x00800000 /* - * Version number information - */ - -#define CONFIG_IDENT_STRING " EDMiniV2" - -/* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index c6a756d..0a50154 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -24,7 +24,6 @@ /* select serial console configuration */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_IDENT_STRING " for ESPRESSO7420" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" /* DRAM Memory Banks */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index ffbe660..ae6539c 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -16,11 +16,6 @@ #define _CONFIG_GOFLEXHOME_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nSeagate GoFlex Home" - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 82b1830..c1b43fd 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -26,11 +26,6 @@ #endif /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nMarvell-gplugD" - -/* * High Level Configuration Options */ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 8b57354..842ed16 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -340,9 +340,6 @@ /* no DDR2 Controller */ #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1 -/* Identification string */ -#define CONFIG_IDENT_STRING " Gaisler LEON3 GR-CPCI-AX2000" - /* default kernel command line */ #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0" diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 265f03c..fa10676 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -306,9 +306,6 @@ /* no DDR2 Controller */ #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1 -/* Identification string */ -#define CONFIG_IDENT_STRING " Gaisler LEON3 EP2S60" - /* default kernel command line */ #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0" diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 36acf01..9e00ff9 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -272,9 +272,6 @@ /* no DDR2 Controller */ #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1 -/* Identification string */ -#define CONFIG_IDENT_STRING " Gaisler LEON3 GR-XC3S-1500" - /* default kernel command line */ #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0" diff --git a/include/configs/grsim.h b/include/configs/grsim.h index c2656fb..5736540 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -292,8 +292,6 @@ /* default kernel command line */ #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0" -#define CONFIG_IDENT_STRING " Gaisler GRSIM" - /* TSIM command: * $ ./tsim-leon3 -mmu -cas * diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 59adbdc..0f3204e 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -287,6 +287,4 @@ /* default kernel command line */ #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0" -#define CONFIG_IDENT_STRING " Gaisler GRSIM LEON2" - #endif /* __CONFIG_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 5907e98..5ac29db 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -11,11 +11,6 @@ #define _CONFIG_GURUPLUG_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nMarvell-GuruPlug" - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 5e5aa19..39faf80 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -21,8 +21,6 @@ #define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_IDENT_STRING "hikey" - #define CONFIG_BOARD_EARLY_INIT_F /* Physical Memory Map */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index c5e6828..99dcb75 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -20,12 +20,6 @@ #define CONFIG_SYS_TEXT_BASE 0xFE000000 -#ifdef CONFIG_HRCON_DH -#define CONFIG_IDENT_STRING " hrcon dh 0.01" -#else -#define CONFIG_IDENT_STRING " hrcon 0.01" -#endif - #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index ab23607..f686c7f 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -10,11 +10,6 @@ #define _CONFIG_IB62x0_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING " RaidSonic ICY BOX IB-NAS62x0" - -/* * High level configuration options */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index f0d4250..802b1a3 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -10,11 +10,6 @@ #define _CONFIG_ICONNECT_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING " Iomega iConnect" - -/* * High level configuration options */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h new file mode 100644 index 0000000..0a7fe60 --- /dev/null +++ b/include/configs/imgtec_xilfpga.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2016, Imagination Technologies Ltd. + * + * Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Imagination Technologies Ltd. MIPSfpga + */ + +#ifndef __XILFPGA_CONFIG_H +#define __XILFPGA_CONFIG_H + +/* BootROM + MIG is pretty smart. DDR and Cache initialized */ +#define CONFIG_SKIP_LOWLEVEL_INIT + +/*-------------------------------------------- + * CPU configuration + */ +/* CPU Timer rate */ +#define CONFIG_SYS_MIPS_TIMER_FREQ 50000000 + +/* Cache Configuration */ +#define CONFIG_SYS_MIPS_CACHE_MODE CONF_CM_CACHABLE_NONCOHERENT + +/*---------------------------------------------------------------------- + * Memory Layout + */ + +/* SDRAM Configuration (for final code, data, stack, heap) */ +#define CONFIG_SYS_SDRAM_BASE 0x80000000 +#define CONFIG_SYS_SDRAM_SIZE 0x08000000 /* 128 Mbytes */ +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - 0x1000) + +#define CONFIG_SYS_MALLOC_LEN (256 << 10) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_LOAD_ADDR 0x80500000 /* default load address */ + +/*---------------------------------------------------------------------- + * Commands + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ + +/*------------------------------------------------- + * FLASH configuration + */ +#define CONFIG_SYS_NO_FLASH + +/*------------------------------------------------------------ + * Console Configuration + */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/ +#define CONFIG_BAUDRATE 115200 + +/* ------------------------------------------------- + * Environment + */ +#define CONFIG_ENV_IS_NOWHERE 1 +#define CONFIG_ENV_SIZE 0x4000 + +/* --------------------------------------------------------------------- + * Board boot configuration + */ +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + +#endif /* __XILFPGA_CONFIG_H */ diff --git a/include/configs/intip.h b/include/configs/intip.h index c5af365..5aa8fae 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -24,10 +24,8 @@ #define CONFIG_460EX 1 /* Specific PPC460EX */ #ifdef CONFIG_DEVCONCENTER #define CONFIG_HOSTNAME devconcenter -#define CONFIG_IDENT_STRING " devconcenter 0.06" #else #define CONFIG_HOSTNAME intip -#define CONFIG_IDENT_STRING " intip 0.06" #endif #define CONFIG_440 1 diff --git a/include/configs/io.h b/include/configs/io.h index 544d044..8c9ee0e 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -17,7 +17,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME io -#define CONFIG_IDENT_STRING " io 0.06" #include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/io64.h b/include/configs/io64.h index 14ffb33..894da84 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -36,7 +36,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME io64 -#define CONFIG_IDENT_STRING " io64 0.02" #include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/iocon.h b/include/configs/iocon.h index d85a76c..87f56f1 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -17,7 +17,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME iocon -#define CONFIG_IDENT_STRING " iocon 0.06" #include "amcc-common.h" /* Reclaim some space. */ diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index b377c41..0d78cfa 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -23,14 +23,12 @@ /* KM_KIRKWOOD */ #if defined(CONFIG_KM_KIRKWOOD) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood" #define CONFIG_HOSTNAME km_kirkwood #define CONFIG_KM_DISABLE_PCIE #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ /* KM_KIRKWOOD_PCI */ #elif defined(CONFIG_KM_KIRKWOOD_PCI) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood PCI" #define CONFIG_HOSTNAME km_kirkwood_pci #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_FPGA_CONFIG @@ -39,7 +37,6 @@ /* KM_KIRKWOOD_128M16 */ #elif defined(CONFIG_KM_KIRKWOOD_128M16) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood 128M16" #define CONFIG_HOSTNAME km_kirkwood_128m16 #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg @@ -51,10 +48,8 @@ #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ # if defined(CONFIG_KM_NUSA) -#define CONFIG_IDENT_STRING "\nKeymile NUSA" #define CONFIG_HOSTNAME kmnusa # elif defined(CONFIG_KM_SUGP1) -#define CONFIG_IDENT_STRING "\nKeymile SUGP1" #define CONFIG_HOSTNAME kmsugp1 #define KM_PCIE_RESET_MPP7 #endif @@ -69,7 +64,6 @@ /* KM_MGCOGE3UN */ #elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_IDENT_STRING "\nKeymile COGE3UN" #define CONFIG_HOSTNAME mgcoge3un #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #undef CONFIG_SYS_KWD_CONFIG @@ -81,7 +75,6 @@ /* KMCOGE5UN */ #elif defined(CONFIG_KM_COGE5UN) -#define CONFIG_IDENT_STRING "\nKeymile COGE5UN" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg @@ -93,7 +86,6 @@ /* KM_PORTL2 */ #elif defined(CONFIG_KM_PORTL2) -#define CONFIG_IDENT_STRING "\nKeymile Port-L2" #define CONFIG_HOSTNAME portl2 #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_PIGGY4_88E6061 @@ -101,7 +93,6 @@ /* KM_SUV31 */ #elif defined(CONFIG_KM_SUV31) #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_IDENT_STRING "\nKeymile SUV31" #define CONFIG_HOSTNAME kmsuv31 #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 9b2c575..bd6c83e 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -12,27 +12,20 @@ */ #if defined(CONFIG_INETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_INETSPACE_V2 -#define CONFIG_IDENT_STRING " IS v2" #elif defined(CONFIG_NETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 -#define CONFIG_IDENT_STRING " NS v2" #elif defined(CONFIG_NETSPACE_LITE_V2) #define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */ #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 -#define CONFIG_IDENT_STRING " NS v2 Lite" #elif defined(CONFIG_NETSPACE_MINI_V2) #define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */ #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 -#define CONFIG_IDENT_STRING " NS v2 Mini" #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 -#define CONFIG_IDENT_STRING " NS Max v2" #elif defined(CONFIG_D2NET_V2) #define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 -#define CONFIG_IDENT_STRING " D2 v2" #elif defined(CONFIG_NET2BIG_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 -#define CONFIG_IDENT_STRING " 2Big v2" #else #error "Unknown board" #endif diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h index 16e37bf..cec12ad 100644 --- a/include/configs/ls2080a_emu.h +++ b/include/configs/ls2080a_emu.h @@ -9,8 +9,6 @@ #include "ls2080a_common.h" -#define CONFIG_IDENT_STRING " LS2080A-EMU" - #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 133333333 diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 7f245b5..1851d41 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -9,8 +9,6 @@ #include "ls2080a_common.h" -#define CONFIG_IDENT_STRING " LS2080A-SIMU" - #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 133333333 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index e878cbe..baa35db 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -12,12 +12,10 @@ * Version number information */ #if defined(CONFIG_LSCHLV2) -#define CONFIG_IDENT_STRING " LS-CHLv2" #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg #define CONFIG_MACH_TYPE 3006 #define CONFIG_SYS_TCLK 166666667 /* 166 MHz */ #elif defined(CONFIG_LSXHL) -#define CONFIG_IDENT_STRING " LS-XHL" #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg #define CONFIG_MACH_TYPE 2663 /* CONFIG_SYS_TCLK is 200000000 by default */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index da63842..7b88ad5 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -12,11 +12,6 @@ #define __CONFIG_H /* - * Liebherr extra version info - */ -#define CONFIG_IDENT_STRING " - v2.0" - -/* * High Level Configuration Options */ #define CONFIG_LWMON5 1 /* Board is lwmon5 */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index cca2324..55dbc44 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -17,7 +17,6 @@ */ #define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS #define CONFIG_MACH_TYPE MACH_TYPE_NAS220 -#define CONFIG_IDENT_STRING "\nNAS 220" /* * High Level Configuration Options (easy to change) diff --git a/include/configs/neo.h b/include/configs/neo.h index 4f244a9..8b6ee92 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -17,7 +17,6 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME neo -#define CONFIG_IDENT_STRING " neo 0.02" #include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index bf5df9c..1d5b3d5 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_IDENT_STRING " odroid-c2" - /* Serial setup */ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 5196d58..0b57949 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -12,7 +12,6 @@ #include <configs/exynos5-common.h> #undef CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_IDENT_STRING " for ODROID-XU3" #define CONFIG_BOARD_COMMON diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 4defa7e..908a1af 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -15,23 +15,6 @@ #define _CONFIG_OPENRD_H /* - * Version number information - */ -#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE -# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" -#else -# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT -# define CONFIG_IDENT_STRING "\nOpenRD-Client" -# else -# ifdef CONFIG_BOARD_IS_OPENRD_BASE -# define CONFIG_IDENT_STRING "\nOpenRD-Base" -# else -# error Unknown OpenRD board specified -# endif -# endif -#endif - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ diff --git a/include/configs/origen.h b/include/configs/origen.h index 1fa2f4d..0f76d32 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -87,8 +87,6 @@ "fi;" \ "load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} " -#define CONFIG_IDENT_STRING " for ORIGEN" - #define CONFIG_CLK_1000_400_200 /* MIU (Memory Interleaving Unit) */ diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index 6c42aaa..b01fe4c 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -29,8 +29,6 @@ #define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_IDENT_STRING " for Peach-Pi" - /* Display */ #define CONFIG_LCD #ifdef CONFIG_LCD diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 6c68dd2..c4ae0e2 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -29,8 +29,6 @@ #define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_IDENT_STRING " for Peach-Pit" - /* DRAM Memory Banks */ #define CONFIG_NR_DRAM_BANKS 4 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 6393ff3..5660cb0 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -18,7 +18,6 @@ */ #define MACH_TYPE_POGO_E02 3542 #define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02 -#define CONFIG_IDENT_STRING "\nPogo E02" /* * High Level Configuration Options (easy to change) diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index fa76a25..748a2ea 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -11,11 +11,6 @@ #define _CONFIG_SHEEVAPLUG_H /* - * Version number information - */ -#define CONFIG_IDENT_STRING "\nMarvell-Sheevaplug" - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 92a0833..5c60887 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -20,7 +20,6 @@ #define CONFIG_BOARD_COMMON -#define CONFIG_IDENT_STRING " for SMDK5250" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" #endif /* __CONFIG_SMDK_H */ diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index a46ca74..d8d095f 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -31,7 +31,6 @@ #define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_IDENT_STRING " for SMDK5420" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" /* USB */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 9d52689..0ad1a27 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -167,7 +167,6 @@ #define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */ -#define CONFIG_IDENT_STRING " for SMDKC100" #if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000) #define CONFIG_ENABLE_MMU diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index efb18ff..ccb8921 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -67,7 +67,6 @@ #define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE /* FLASH and environment organization */ -#define CONFIG_IDENT_STRING " for SMDKC210/V310" #define CONFIG_CLK_1000_400_200 diff --git a/include/configs/snow.h b/include/configs/snow.h index 1d8d8da..01d9db8 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -15,7 +15,6 @@ #define CONFIG_BOARD_COMMON -#define CONFIG_IDENT_STRING " for snow" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" #endif /* __CONFIG_SNOW_H */ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 7f6cb93..a6973c5 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -182,7 +182,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (1024*1024) -#define CONFIG_IDENT_STRING "-SPEAr" #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/spring.h b/include/configs/spring.h index 8940123..d8c9b4a 100644 --- a/include/configs/spring.h +++ b/include/configs/spring.h @@ -13,7 +13,6 @@ #define CONFIG_BOARD_COMMON -#define CONFIG_IDENT_STRING " for spring" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" #endif /* __CONFIG_SPRING_H */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 5fabbad..5cd37d7 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -20,16 +20,6 @@ #define CONFIG_SYS_TEXT_BASE 0xFE000000 -#ifdef CONFIG_STRIDER_CPU_DP -#define CONFIG_IDENT_STRING " strider cpu dp 0.01" -#elif defined(CONFIG_STRIDER_CPU) -#define CONFIG_IDENT_STRING " strider cpu 0.01" -#elif defined(CONFIG_STRIDER_CON_DP) -#define CONFIG_IDENT_STRING " strider con dp 0.01" -#else -#define CONFIG_IDENT_STRING " strider con 0.01" -#endif - #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 8de9c2b..deb2e8d 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -178,7 +178,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ -#define CONFIG_IDENT_STRING " Allwinner Technology" #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 5c3b3da..4387082 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_NO_FLASH -#define CONFIG_IDENT_STRING \ - " for Cavium Thunder CN88XX ARM v8 Multi-Core" - #define MEM_BASE 0x00500000 #define CONFIG_SYS_LOWMEM_BASE MEM_BASE diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 71c4a1f..48834c2 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -19,8 +19,6 @@ #define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_IDENT_STRING " vexpress_aemv8a" - /* Link Definitions */ #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) diff --git a/include/configs/x600.h b/include/configs/x600.h index 574f00c..9db4524 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -148,7 +148,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (8 << 20) -#define CONFIG_IDENT_STRING "-SPEAr" #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index aeb65ee..5ed8beb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -34,10 +34,6 @@ /* Have release address at the end of 256MB for now */ #define CPU_RELEASE_ADDR 0xFFFFFF0 -#if !defined(CONFIG_IDENT_STRING) -# define CONFIG_IDENT_STRING " Xilinx ZynqMP" -#endif - #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ @@ -79,7 +75,9 @@ /* Diff from config_distro_defaults.h */ #define CONFIG_SUPPORT_RAW_INITRD +#if !defined(CONFIG_SPL_BUILD) #define CONFIG_ENV_VARS_UBOOT_CONFIG +#endif #define CONFIG_AUTO_COMPLETE /* PXE */ @@ -112,7 +110,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000 #if defined(CONFIG_ZYNQMP_USB) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_XHCI_ZYNQMP @@ -140,7 +138,6 @@ # define DFU_ALT_INFO #endif - #define CONFIG_BOARD_LATE_INIT /* Do not preserve environment */ @@ -189,7 +186,6 @@ #endif #ifdef CONFIG_SATA_CEVA -#define CONFIG_AHCI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT @@ -251,13 +247,24 @@ DFU_ALT_INFO #endif +/* SPL can't handle all huge variables - define just DFU */ +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT) +#undef CONFIG_EXTRA_ENV_SETTINGS +# define CONFIG_EXTRA_ENV_SETTINGS \ + "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \ + "atf-uboot.ub ram 0x10000000 0x1000000;" \ + "Image ram 0x80000 0x3f80000;" \ + "system.dtb ram 0x4000000 0x100000\0" \ + "dfu_bufsiz=0x1000\0" +#endif + #define CONFIG_SPL_TEXT_BASE 0xfffc0000 #define CONFIG_SPL_STACK 0xfffffffc -#define CONFIG_SPL_MAX_SIZE 0x20000 +#define CONFIG_SPL_MAX_SIZE 0x40000 /* Just random location in OCM */ -#define CONFIG_SPL_BSS_START_ADDR 0x1000000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000000 +#define CONFIG_SPL_BSS_START_ADDR 0x0 +#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT @@ -269,7 +276,7 @@ #define CONFIG_SYS_SPL_ARGS_ADDR 0x8000000 /* ATF is my kernel image */ -#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "atf.ub" +#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "atf-uboot.ub" /* FIT load address for RAM boot */ #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000 @@ -283,4 +290,18 @@ # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT) +# undef CONFIG_CMD_BOOTD +# define CONFIG_SPL_ENV_SUPPORT +# define CONFIG_SPL_HASH_SUPPORT +# define CONFIG_ENV_MAX_ENTRIES 10 + +# define CONFIG_SYS_SPL_MALLOC_START 0x20000000 +# define CONFIG_SYS_SPL_MALLOC_SIZE 0x10000000 + +#ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE +# error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used" +#endif +#endif + #endif /* __XILINX_ZYNQMP_H */ diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index 44434aa..8e4b960 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -16,7 +16,6 @@ #define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9) #define CONFIG_ZYNQ_EEPROM -#define CONFIG_AHCI #define CONFIG_SATA_CEVA #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \ ZYNQMP_USB1_XHCI_BASEADDR} diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h index c9f4432..b19a552 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h @@ -15,8 +15,6 @@ #define CONFIG_AHCI #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} -#define CONFIG_IDENT_STRING " Xilinx ZynqMP ZC1751 xm015 dc1" - #include <configs/xilinx_zynqmp.h> #endif /* __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h index 526d0bb..0714d72 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h @@ -12,8 +12,6 @@ #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB1_XHCI_BASEADDR} -#define CONFIG_IDENT_STRING " Xilinx ZynqMP ZC1751 xm016 dc2" - #include <configs/xilinx_zynqmp.h> #endif /* __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h b/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h deleted file mode 100644 index 65277a6..0000000 --- a/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Configuration for Xilinx ZynqMP zc1751 XM018 DC4 - * - * (C) Copyright 2015 Xilinx, Inc. - * Michal Simek <michal.simek@xilinx.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H -#define __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H - -#define CONFIG_IDENT_STRING " Xilinx ZynqMP ZC1751 xm018 dc4" - -#include <configs/xilinx_zynqmp.h> - -#endif /* __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h index 76350d9..6a0e397 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h @@ -13,8 +13,6 @@ #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_IDENT_STRING " Xilinx ZynqMP ZC1751 xm019 dc5" - #include <configs/xilinx_zynqmp.h> #endif /* __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H */ diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 7ceab32..adf2321 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -45,8 +45,6 @@ #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} -#define CONFIG_IDENT_STRING " Xilinx ZynqMP ZCU102" - #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_EEPROM_BUS 5 diff --git a/include/dt-bindings/clock/boston-clock.h b/include/dt-bindings/clock/boston-clock.h new file mode 100644 index 0000000..25f9cd2 --- /dev/null +++ b/include/dt-bindings/clock/boston-clock.h @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2016 Imagination Technologies + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef __DT_BINDINGS_CLOCK_BOSTON_CLOCK_H__ +#define __DT_BINDINGS_CLOCK_BOSTON_CLOCK_H__ + +#define BOSTON_CLK_SYS 0 +#define BOSTON_CLK_CPU 1 + +#endif /* __DT_BINDINGS_CLOCK_BOSTON_CLOCK_H__ */ diff --git a/include/dt-bindings/interrupt-controller/mips-gic.h b/include/dt-bindings/interrupt-controller/mips-gic.h new file mode 100644 index 0000000..cf35a57 --- /dev/null +++ b/include/dt-bindings/interrupt-controller/mips-gic.h @@ -0,0 +1,9 @@ +#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_MIPS_GIC_H +#define _DT_BINDINGS_INTERRUPT_CONTROLLER_MIPS_GIC_H + +#include <dt-bindings/interrupt-controller/irq.h> + +#define GIC_SHARED 0 +#define GIC_LOCAL 1 + +#endif diff --git a/include/mmc.h b/include/mmc.h index aa6d5d1..e815eb3 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -11,6 +11,7 @@ #define _MMC_H_ #include <linux/list.h> +#include <linux/sizes.h> #include <linux/compiler.h> #include <part.h> @@ -102,6 +103,7 @@ #define SD_CMD_SWITCH_UHS18V 11 #define SD_CMD_APP_SET_BUS_WIDTH 6 +#define SD_CMD_APP_SD_STATUS 13 #define SD_CMD_ERASE_WR_BLK_START 32 #define SD_CMD_ERASE_WR_BLK_END 33 #define SD_CMD_APP_SEND_OP_COND 41 @@ -392,6 +394,12 @@ struct mmc_config { unsigned char part_type; }; +struct sd_ssr { + unsigned int au; /* In sectors */ + unsigned int erase_timeout; /* In milliseconds */ + unsigned int erase_offset; /* In milliseconds */ +}; + /* * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device * with mmc_get_mmc_dev(). @@ -426,6 +434,7 @@ struct mmc { uint write_bl_len; uint erase_grp_size; /* in 512-byte sectors */ uint hc_wp_grp_size; /* in 512-byte sectors */ + struct sd_ssr ssr; /* SD status register */ u64 capacity; u64 capacity_user; u64 capacity_boot; diff --git a/include/sdhci.h b/include/sdhci.h index 6844c73..144570f 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -97,6 +97,7 @@ #define SDHCI_DIV_MASK 0xFF #define SDHCI_DIV_MASK_LEN 8 #define SDHCI_DIV_HI_MASK 0x300 +#define SDHCI_PROG_CLOCK_MODE 0x0020 #define SDHCI_CLOCK_CARD_EN 0x0004 #define SDHCI_CLOCK_INT_STABLE 0x0002 #define SDHCI_CLOCK_INT_EN 0x0001 @@ -242,6 +243,7 @@ struct sdhci_host { unsigned int quirks; unsigned int host_caps; unsigned int version; + unsigned int clk_mul; /* Clock Multiplier value */ unsigned int clock; struct mmc *mmc; const struct sdhci_ops *ops; diff --git a/include/version.h b/include/version.h index 777e9f6..0494309 100644 --- a/include/version.h +++ b/include/version.h @@ -14,10 +14,6 @@ #include "generated/version_autogenerated.h" #endif -#ifndef CONFIG_IDENT_STRING -#define CONFIG_IDENT_STRING "" -#endif - #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \ U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING diff --git a/include/xilinx.h b/include/xilinx.h index aebcb3b..d2a2ea7 100644 --- a/include/xilinx.h +++ b/include/xilinx.h @@ -21,6 +21,7 @@ typedef enum { /* typedef xilinx_iface */ master_selectmap, /* master SelectMap (virtex2) */ slave_selectmap, /* slave SelectMap (virtex2) */ devcfg, /* devcfg interface (zynq) */ + csu_dma, /* csu_dma interface (zynqmp) */ max_xilinx_iface_type /* insert all new types before this */ } xilinx_iface; /* end, typedef xilinx_iface */ @@ -31,6 +32,7 @@ typedef enum { /* typedef xilinx_family */ xilinx_virtex2, /* Virtex2 Family */ xilinx_spartan3, /* Spartan-III Family */ xilinx_zynq, /* Zynq Family */ + xilinx_zynqmp, /* ZynqMP Family */ max_xilinx_type /* insert all new types before this */ } xilinx_family; /* end, typedef xilinx_family */ diff --git a/include/zynqmppl.h b/include/zynqmppl.h new file mode 100644 index 0000000..542ace9 --- /dev/null +++ b/include/zynqmppl.h @@ -0,0 +1,24 @@ +/* + * (C) Copyright 2015 Xilinx, Inc, + * Michal Simek <michal.simek@xilinx.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef _ZYNQMPPL_H_ +#define _ZYNQMPPL_H_ + +#include <xilinx.h> + +#define ZYNQMP_SIP_SVC_CSU_DMA_CHIPID 0xC2000018 +#define ZYNQMP_SIP_SVC_PM_FPGA_LOAD 0xC2000016 +#define ZYNQMP_FPGA_OP_INIT (1 << 0) +#define ZYNQMP_FPGA_OP_LOAD (1 << 1) +#define ZYNQMP_FPGA_OP_DONE (1 << 2) + +extern struct xilinx_fpga_op zynqmp_op; + +#define XILINX_ZYNQMP_DESC \ +{ xilinx_zynqmp, csu_dma, 1, &zynqmp_op, 0, &zynqmp_op } + +#endif /* _ZYNQMPPL_H_ */ |