diff options
Diffstat (limited to 'include')
95 files changed, 160 insertions, 252 deletions
diff --git a/include/ACEX1K.h b/include/ACEX1K.h index 9814bba284..7c5253c66c 100644 --- a/include/ACEX1K.h +++ b/include/ACEX1K.h @@ -60,6 +60,16 @@ typedef struct { #define Altera_EP2C35_SIZE 883905 #define Altera_EP3C5_SIZE 368011 /* .rbf size in bytes */ +#define ALTERA_EP4CE6_SIZE 368011 /* 2944088 Bits */ +#define ALTERA_EP4CE10_SIZE 368011 /* 2944088 Bits */ +#define ALTERA_EP4CE15_SIZE 510856 /* 4086848 Bits */ +#define ALTERA_EP4CE22_SIZE 718569 /* 5748552 Bits */ +#define ALTERA_EP4CE30_SIZE 1191788 /* 9534304 Bits */ +#define ALTERA_EP4CE40_SIZE 1191788 /* 9534304 Bits */ +#define ALTERA_EP4CE55_SIZE 1861195 /* 14889560 Bits */ +#define ALTERA_EP4CE75_SIZE 2495719 /* 19965752 Bits */ +#define ALTERA_EP4CE115_SIZE 3571462 /* 28571696 Bits */ + /* Descriptor Macros *********************************************************************/ /* ACEX1K devices */ diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 7c2220643b..5372d5d8cd 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -33,7 +33,7 @@ typedef struct global_data { /* We cannot bracket this with CONFIG_PCI due to mpc5xxx */ unsigned long pci_clk; unsigned long mem_clk; -#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) +#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) unsigned long fb_base; /* Base address of framebuffer mem */ #endif #if defined(CONFIG_POST) diff --git a/include/autoboot.h b/include/autoboot.h index 3ebd6f90e3..ac8157e570 100644 --- a/include/autoboot.h +++ b/include/autoboot.h @@ -27,7 +27,7 @@ const char *bootdelay_process(void); * autoboot_command() - run the autoboot command * * If enabled, run the autoboot command returned from bootdelay_process(). - * Also do the CONFIG_MENUKEY processing if enabled. + * Also do the CONFIG_AUTOBOOT_MENUKEY processing if enabled. * * @cmd: Command to run */ diff --git a/include/clk.h b/include/clk.h index f8f56d9cf0..2ebc905e04 100644 --- a/include/clk.h +++ b/include/clk.h @@ -356,4 +356,13 @@ static inline bool clk_valid(struct clk *clk) * @return zero on success, or -ENOENT on error */ int clk_get_by_id(ulong id, struct clk **clkp); + +/** + * clk_dev_binded() - Check whether the clk has a device binded + * + * @clk A pointer to the clk + * + * @return true on binded, or false on no + */ +bool clk_dev_binded(struct clk *clk); #endif diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 7640d7610d..7352e34b9c 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -347,10 +347,6 @@ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 493f6df187..2ae1069e4f 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -404,10 +404,6 @@ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index e4ebd339de..64172f3619 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -11,7 +11,6 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9111 */ #define CONFIG_SMC91111 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 0da34d05af..9bf5d9d3fd 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -236,10 +236,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 400000 -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=tqm834x\0" \ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 6368872e5b..f4a000f020 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -258,6 +258,4 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 1 - -#define CONFIG_SHOW_BOOT_PROGRESS #endif /* ! __CONFIG_AM335X_SHC_H */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index cacd799aa2..5fa393d45d 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -68,15 +68,6 @@ */ #ifdef CONFIG_USB_AM35X - -#ifdef CONFIG_USB_MUSB_HCD - -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_PREBOOT "usb start" -#endif /* CONFIG_USB_KEYBOARD */ - -#endif /* CONFIG_USB_MUSB_HCD */ - #ifdef CONFIG_USB_MUSB_UDC /* USB device configuration */ #define CONFIG_USB_DEVICE 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c2c5c1f668..63489133a8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -29,18 +29,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 -#ifdef CONFIG_USB_MUSB_AM35X - -#ifdef CONFIG_USB_MUSB_HOST - -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_PREBOOT "usb start" -#endif /* CONFIG_USB_KEYBOARD */ - -#endif /* CONFIG_USB_MUSB_HOST */ - -#endif /* CONFIG_USB_MUSB_AM35X */ - /* I2C */ /* Ethernet */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b7a7ec5ee0..044ce4467e 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_PREBOOT "run check_flash check_env;" /* * Boot Linux diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 0cb40e721c..0d170ec993 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -14,8 +14,6 @@ #define BOARD_LATE_INIT -#undef CONFIG_SHOW_BOOT_PROGRESS - #define CONFIG_ARCH_CPU_INIT #define CONFIG_TMU_TIMER #define CONFIG_SYS_TIMER_COUNTS_DOWN diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 841f361648..8aa6e1d0c3 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK -#define CONFIG_PREBOOT - #define CONFIG_S5P_PA_SYSRAM 0x02020000 #define CONFIG_SMP_PEN_ADDR CONFIG_S5P_PA_SYSRAM diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index cc289244ff..b8437052a9 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -157,10 +157,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Save the prior stage provided DTB. */ -#define CONFIG_PREBOOT \ - "fdt addr ${fdtcontroladdr};" \ - "fdt move ${fdtcontroladdr} ${fdtsaveaddr};" \ - "fdt addr ${fdtsaveaddr};" /* * Enable in-place RFS with this initrd_high setting. */ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 05ebb7d9c5..285e28b535 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -37,7 +37,6 @@ "run manage_userdata; " /* Enable PREBOOT variable */ -#define CONFIG_PREBOOT /* Set ARP_TIMEOUT to 500ms */ #define CONFIG_ARP_TIMEOUT 500UL diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index 0f293849ab..dff41239ba 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -23,8 +23,6 @@ "setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \ "setenv stdout nc;setenv stdin nc;setenv stderr nc\0" -#define CONFIG_PREBOOT "run cfgscr; run brdefaultip" - /* Network defines */ #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 2e8dda8ab8..60bac9adc8 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -144,8 +144,6 @@ "echo WARNING: Could not determine dtb to use; fi; \0" \ BOOTENV -#define CONFIG_PREBOOT "usb start;sf probe" - #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 2) \ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 94aa2736ab..93dcad4b66 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -37,6 +37,4 @@ "upd_uboot=tftp 100000 conga/u-boot.rom;" \ "sf probe;sf update 100000 0 800000;saveenv\0" -#define CONFIG_PREBOOT - #endif /* __CONFIG_H */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 3affdb0f68..54bbfe3f55 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -124,8 +124,6 @@ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth1\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index f7bad8e1e9..a8e1850f2b 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -42,6 +42,4 @@ "upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \ "sf probe;sf update 100000 0 800000;saveenv\0" -#define CONFIG_PREBOOT - #endif /* __CONFIG_H */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 7269c42a5f..b175e9d574 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -99,7 +99,5 @@ /* Default Environment */ #define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm" #define CONFIG_LOADADDR 0x80000 -#undef CONFIG_PREBOOT /* override preboot for USB and SPI flash init */ -#define CONFIG_PREBOOT "usb start; sf probe" #endif /* _CONFIG_SYNOLOGY_DS414_H */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 11d367a151..0ff48287ac 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -100,8 +100,6 @@ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 02ceb4c8fc..a27627e721 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -138,7 +138,6 @@ /* Miscellaneous configurable options */ #define CONFIG_HWCONFIG -#define CONFIG_PREBOOT /* Memory configuration */ #define CONFIG_SYS_MEMTEST_START 0x10000000 diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 6e6c1714ce..8fb321178f 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -403,8 +403,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index b1d01c58f9..43cb14c14e 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -253,9 +253,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_LOADS_ECHO #define CONFIG_TIMESTAMP -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run nfsboot\\\" " \ - "to mount root filesystem over NFS;echo" #define CONFIG_BOOTCOMMAND "run boot_cramfs" #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 071d9289ef..a2c8224da7 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -18,8 +18,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#undef CONFIG_SHOW_BOOT_PROGRESS - /* MEMORY */ #define KZM_SDRAM_BASE (0x40000000) #define PHYS_SDRAM KZM_SDRAM_BASE diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 55c4e63325..3ba5548f25 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -29,7 +29,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_KIRKWOOD_GPIO diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index e98dbfbb7e..a432259cfe 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -185,7 +185,6 @@ /* * Extra Environments */ -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_HOSTNAME "m53menlo" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index a1fd5f6195..aeab2e983b 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -40,8 +40,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_PREBOOT /* enable preboot variable */ - /* * Hardware drivers */ diff --git a/include/configs/meson64.h b/include/configs/meson64.h index d82a674270..78b1615d5c 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -31,7 +31,6 @@ #ifdef CONFIG_USB_KEYBOARD #define STDIN_CFG "usbkbd,serial" -#define CONFIG_PREBOOT "usb start" #else #define STDIN_CFG "serial" #endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index d1ab40ec13..814fec5b33 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -140,8 +140,6 @@ /* architecture dependent code */ #define CONFIG_SYS_USR_EXCEP /* user exception */ -#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" - #ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \ "nor0=flash-0\0"\ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index a803093163..e6d5c680d7 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -38,7 +38,6 @@ #endif /* auto boot */ -#define CONFIG_PREBOOT /* * For booting Linux, the board info and command line data diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 10b94f438f..ff8cc3c770 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index b28f3b9408..f3f8538541 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index f5fd01de22..fc498b2481 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -66,7 +66,6 @@ #define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED /* Framebuffer and LCD */ -#define CONFIG_PREBOOT #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index ab61a07f96..bbe0574033 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -160,6 +160,5 @@ /* Framebuffer and LCD */ #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_PREBOOT #endif /* __CONFIG_H */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 4f179081a8..b734b822dd 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -176,7 +176,6 @@ #endif /* Framebuffer and LCD */ -#define CONFIG_PREBOOT #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 7b4ae2102e..3cf2f1ce28 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -49,17 +49,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_PREBOOT \ - "if hdmidet; then " \ - "usb start; " \ - "setenv stdin serial,usbkbd; "\ - "setenv stdout serial,vga; " \ - "setenv stderr serial,vga; " \ - "else " \ - "setenv stdin serial; " \ - "setenv stdout serial; " \ - "setenv stderr serial; " \ - "fi;" /* Command definition */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index afaa908406..23c370b07c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -67,8 +67,6 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_PREBOOT "" - #ifdef CONFIG_CMD_MMC #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) #else diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index d9f4bdc1d6..fd755bbcea 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -253,30 +253,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "bootmenu_delay=30\0" \ "" -#define CONFIG_PREBOOT \ - "setenv mmcnum 1; setenv mmcpart 1;" \ - "setenv mmcscriptfile bootmenu.scr;" \ - "if run switchmmc; then " \ - "setenv mmcdone true;" \ - "setenv mmctype fat;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext2;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext4;" \ - "if run scriptload; then true; else " \ - "setenv mmcdone false;" \ - "fi;" \ - "fi;" \ - "fi;" \ - "if ${mmcdone}; then " \ - "run scriptboot;" \ - "fi;" \ - "fi;" \ - "if run slide; then true; else " \ - "setenv bootmenu_delay 0;" \ - "setenv bootdelay 0;" \ - "fi" - #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \ @@ -294,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU_SHOW - /* * Miscellaneous configurable options */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a2a6be7cf8..e8c60838b7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -58,8 +58,6 @@ /* TWL4030 LED Support */ -#define CONFIG_PREBOOT "usb start" - #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 1fbd371a50..b7c3ddf564 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -60,10 +60,6 @@ /* Environment information */ -#define CONFIG_PREBOOT \ - "setenv preboot;" \ - "saveenv;" - #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index e0c76ff43d..309b4717c4 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -76,7 +76,6 @@ #define ACFG_CONSOLE_DEV ttymxc0 #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" -#define CONFIG_PREBOOT "run check_env" #define CONFIG_BOOTCOMMAND "run emmcboot" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 925e7ae3db..7dfcccb82b 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -77,8 +77,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #endif -#define CONFIG_PREBOOT "" - /* Thermal support */ #define CONFIG_IMX_THERMAL diff --git a/include/configs/platinum.h b/include/configs/platinum.h index d1ebaf5561..1b57e9931f 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -102,7 +102,6 @@ #define CONFIG_BOOTCOMMAND "run bootubi_scr" /* Miscellaneous configurable options */ -#define CONFIG_PREBOOT /* MTD/UBI/UBIFS config */ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 35e3c5ad7a..c7aaafaad4 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -32,7 +32,6 @@ #include <config_distro_bootcmd.h> -#define CONFIG_PREBOOT "pci enum" #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index df22f780b0..ecea1d4765 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -48,8 +48,4 @@ "ramdisk_addr_r=0x88300000\0" \ BOOTENV -#define CONFIG_PREBOOT \ - "setenv fdt_addr ${fdtcontroladdr};" \ - "fdt addr ${fdtcontroladdr};" - #endif /* __CONFIG_H */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 7f72ff2e11..146a30b4c2 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -18,8 +18,6 @@ #define CONFIG_SPL_TARGET "spl/u-boot-spl.srec" #endif -#undef CONFIG_SHOW_BOOT_PROGRESS - #define CONFIG_ARCH_CPU_INIT #ifndef CONFIG_PINCTRL_PFC diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 203b0a78f2..11bf16b054 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -23,8 +23,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#undef CONFIG_SHOW_BOOT_PROGRESS - #define CONFIG_ARCH_CPU_INIT /* Generic Interrupt Controller Definitions */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 73be079b20..ec0e157ec5 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -56,6 +56,4 @@ BOOTENV #endif -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 92524b06ad..44e8d0ccd2 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -61,6 +61,4 @@ #endif /* CONFIG_SPL_BUILD */ -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 9582cdfb64..42a49c5502 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -56,6 +56,4 @@ BOOTENV #endif -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index da10e29139..eaa1c582e9 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -70,6 +70,4 @@ BOOTENV #endif -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index f76c7d18ef..e706bea8cc 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -73,7 +73,6 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_16K #define CONFIG_SYS_LOAD_ADDR 0x1000000 -#define CONFIG_PREBOOT "usb start" /* Shell */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index ba613672eb..6aa40caa7c 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -48,8 +48,6 @@ #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #endif -#ifdef CONFIG_PCIE1 -#endif #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index c90d8e0e9a..cd7f51c7ce 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -11,7 +11,6 @@ #define CONFIG_CPU_SH7752 1 #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ #define SH7752EVB_SDRAM_BASE (0x40000000) diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 83d123f33a..6b00bd7d90 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -11,7 +11,6 @@ #define CONFIG_CPU_SH7753 1 #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ #define SH7753EVB_SDRAM_BASE (0x40000000) diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index f92f066494..f1955a16b9 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -12,7 +12,6 @@ #define CONFIG_SH7757LCR_DDR_ECC 1 #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ #define SH7757LCR_SDRAM_BASE (0x80000000) diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index d857fcbd9a..10961b14ba 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -15,7 +15,6 @@ #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SHOW_BOOT_PROGRESS /* SCIF */ #define CONFIG_CONS_SCIF2 1 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c07814f91b..dd63adb6db 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -189,7 +189,6 @@ /* UBI Support */ /* Commen environment */ -#define CONFIG_PREBOOT #define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \ "setenv bootargs ${bootargs};" \ "mtdparts default;" \ diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index fc1db2442e..befaeaaf54 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -12,7 +12,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index a2fc1033b3..590a9af274 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -12,7 +12,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 5416c4b170..232536a763 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -33,16 +33,6 @@ * if button B is not pressed, boot normal Linux system immediatelly * if button B is pressed, wait $bootdelay and boot recovery system */ -#define CONFIG_PREBOOT \ - "setenv hostname vining-${unit_serial} ; " \ - "setenv PS1 \"${unit_ident} (${unit_serial}) => \" ; " \ - "if gpio input 78 ; then " \ - "setenv bootdelay 10 ; " \ - "setenv boottype rcvr ; " \ - "else " \ - "setenv bootdelay 5 ; " \ - "setenv boottype norm ; " \ - "fi" #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 7d266d1bcd..c7c30d367a 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -272,11 +272,6 @@ #define CONFIG_LOADADDR 200000 /* default addr for tftp & bootm*/ - -#define CONFIG_PREBOOT "echo;" \ - "echo Welcome on the ABB Socrates Board;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ diff --git a/include/configs/strider.h b/include/configs/strider.h index 8b942e3446..e3d64e52aa 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -436,8 +436,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 7be94ee7d1..d7133a73fc 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -285,10 +285,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_PREBOOT -#endif - #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_ARM64 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index a753d41835..11f76e777b 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -79,15 +79,6 @@ #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #endif /* CONFIG_CMD_USB_MASS_STORAGE */ -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_PREBOOT \ - "usb start; " \ - "if hdmidet; then " \ - "run set_con_hdmi; " \ - "else " \ - "run set_con_serial; " \ - "fi" -#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_CMD_USB */ /* Environment organization */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 9685ee5059..fae0e761fb 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -42,7 +42,6 @@ #ifdef CONFIG_USB_KEYBOARD #define STDIN_KBD_USB ",usbkbd" -#define CONFIG_PREBOOT "usb start" #else #define STDIN_KBD_USB "" #endif diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index e0a033bec1..0c563e714d 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) -#define CONFIG_PREBOOT - #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 6d41d18493..3562a14261 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -47,8 +47,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_PREBOOT - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 69aa79bafc..a915c32607 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -79,8 +79,6 @@ # define EXTRA_ENV_USB #endif -#undef CONFIG_PREBOOT - #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_image=uImage\0" \ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 0de40eddcb..7d5f5fa409 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2354f4e958..89cd8b550a 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -110,8 +110,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/*#define CONFIG_MENU_SHOW*/ - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7fcf76a6bf..c4deef80af 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -14,7 +14,6 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_PHYSMEM #define CONFIG_LMB diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 684faaee2e..bbcb20737b 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -62,7 +62,6 @@ #if defined(CONFIG_ZYNQMP_USB) #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_USB_CABLE_CHECK #define CONFIG_THOR_RESET_OFF #define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 1ef803b020..23f0389615 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -472,7 +472,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 5737cfee95..21e91ee1a4 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -271,7 +271,6 @@ */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 0a87f226f8..73e1fa313f 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -322,7 +322,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 0389874609..e5a41abd4b 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -320,7 +320,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 33255a3fe9..b8de931d2c 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -120,7 +120,6 @@ /*==============================*/ #define CONFIG_MX_CYCLIC -#define CONFIG_SHOW_BOOT_PROGRESS /*=========================================*/ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index c8b6161a29..9d683768f4 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -98,8 +98,6 @@ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024)) #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE) -#define CONFIG_PREBOOT "" - /* * Size of malloc() pool diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index b51914d1e0..bb6a835ece 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -65,7 +65,6 @@ # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300 -# define CONFIG_USB_CABLE_CHECK # define CONFIG_THOR_RESET_OFF # define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ @@ -103,7 +102,6 @@ #define CONFIG_ENV_OVERWRITE /* enable preboot to be loaded before CONFIG_BOOTDELAY */ -#define CONFIG_PREBOOT /* Boot configuration */ #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ diff --git a/include/dt-bindings/clock/axg-aoclkc.h b/include/dt-bindings/clock/axg-aoclkc.h index 61955016a5..8ec4a269c7 100644 --- a/include/dt-bindings/clock/axg-aoclkc.h +++ b/include/dt-bindings/clock/axg-aoclkc.h @@ -21,6 +21,11 @@ #define CLKID_AO_SAR_ADC_SEL 8 #define CLKID_AO_SAR_ADC_DIV 9 #define CLKID_AO_SAR_ADC_CLK 10 -#define CLKID_AO_ALT_XTAL 11 +#define CLKID_AO_CTS_OSCIN 11 +#define CLKID_AO_32K_PRE 12 +#define CLKID_AO_32K_DIV 13 +#define CLKID_AO_32K_SEL 14 +#define CLKID_AO_32K 15 +#define CLKID_AO_CTS_RTC_OSCIN 16 #endif diff --git a/include/dt-bindings/clock/axg-audio-clkc.h b/include/dt-bindings/clock/axg-audio-clkc.h index fd9c362099..75901c6368 100644 --- a/include/dt-bindings/clock/axg-audio-clkc.h +++ b/include/dt-bindings/clock/axg-audio-clkc.h @@ -7,26 +7,6 @@ #ifndef __AXG_AUDIO_CLKC_BINDINGS_H #define __AXG_AUDIO_CLKC_BINDINGS_H -#define AUD_CLKID_SLV_SCLK0 9 -#define AUD_CLKID_SLV_SCLK1 10 -#define AUD_CLKID_SLV_SCLK2 11 -#define AUD_CLKID_SLV_SCLK3 12 -#define AUD_CLKID_SLV_SCLK4 13 -#define AUD_CLKID_SLV_SCLK5 14 -#define AUD_CLKID_SLV_SCLK6 15 -#define AUD_CLKID_SLV_SCLK7 16 -#define AUD_CLKID_SLV_SCLK8 17 -#define AUD_CLKID_SLV_SCLK9 18 -#define AUD_CLKID_SLV_LRCLK0 19 -#define AUD_CLKID_SLV_LRCLK1 20 -#define AUD_CLKID_SLV_LRCLK2 21 -#define AUD_CLKID_SLV_LRCLK3 22 -#define AUD_CLKID_SLV_LRCLK4 23 -#define AUD_CLKID_SLV_LRCLK5 24 -#define AUD_CLKID_SLV_LRCLK6 25 -#define AUD_CLKID_SLV_LRCLK7 26 -#define AUD_CLKID_SLV_LRCLK8 27 -#define AUD_CLKID_SLV_LRCLK9 28 #define AUD_CLKID_DDR_ARB 29 #define AUD_CLKID_PDM 30 #define AUD_CLKID_TDMIN_A 31 @@ -90,5 +70,15 @@ #define AUD_CLKID_TDMOUT_A_LRCLK 134 #define AUD_CLKID_TDMOUT_B_LRCLK 135 #define AUD_CLKID_TDMOUT_C_LRCLK 136 +#define AUD_CLKID_SPDIFOUT_B 151 +#define AUD_CLKID_SPDIFOUT_B_CLK 152 +#define AUD_CLKID_TDM_MCLK_PAD0 155 +#define AUD_CLKID_TDM_MCLK_PAD1 156 +#define AUD_CLKID_TDM_LRCLK_PAD0 157 +#define AUD_CLKID_TDM_LRCLK_PAD1 158 +#define AUD_CLKID_TDM_LRCLK_PAD2 159 +#define AUD_CLKID_TDM_SCLK_PAD0 160 +#define AUD_CLKID_TDM_SCLK_PAD1 161 +#define AUD_CLKID_TDM_SCLK_PAD2 162 #endif /* __AXG_AUDIO_CLKC_BINDINGS_H */ diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 82c9e0c020..b6b127e456 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -130,11 +130,12 @@ #define CLKID_MALI_1_SEL 172 #define CLKID_MALI_1 174 #define CLKID_MALI 175 -#define CLKID_MPLL_5OM 177 +#define CLKID_MPLL_50M 177 #define CLKID_CPU_CLK 187 #define CLKID_PCIE_PLL 201 #define CLKID_VDEC_1 204 #define CLKID_VDEC_HEVC 207 #define CLKID_VDEC_HEVCF 210 +#define CLKID_TS 212 #endif /* __G12A_CLKC_H */ diff --git a/include/dt-bindings/power/r8a77965-sysc.h b/include/dt-bindings/power/r8a77965-sysc.h index 05a4b59173..de82d8a15e 100644 --- a/include/dt-bindings/power/r8a77965-sysc.h +++ b/include/dt-bindings/power/r8a77965-sysc.h @@ -21,7 +21,6 @@ #define R8A77965_PD_A3VC 14 #define R8A77965_PD_3DG_A 17 #define R8A77965_PD_3DG_B 18 -#define R8A77965_PD_A3IR 24 #define R8A77965_PD_A2VC1 26 /* Always-on power area */ diff --git a/include/dt-bindings/power/r8a77970-sysc.h b/include/dt-bindings/power/r8a77970-sysc.h index bf54779d16..85cc5f23cf 100644 --- a/include/dt-bindings/power/r8a77970-sysc.h +++ b/include/dt-bindings/power/r8a77970-sysc.h @@ -16,13 +16,12 @@ #define R8A77970_PD_CA53_CPU0 5 #define R8A77970_PD_CA53_CPU1 6 -#define R8A77970_PD_CR7 13 #define R8A77970_PD_CA53_SCU 21 #define R8A77970_PD_A2IR0 23 -#define R8A77970_PD_A3IR 24 +#define R8A77970_PD_A3IR 24 #define R8A77970_PD_A2IR1 27 -#define R8A77970_PD_A2IR2 28 -#define R8A77970_PD_A2IR3 29 +#define R8A77970_PD_A2DP 28 +#define R8A77970_PD_A2CN 29 #define R8A77970_PD_A2SC0 30 #define R8A77970_PD_A2SC1 31 diff --git a/include/dt-bindings/sound/meson-g12a-tohdmitx.h b/include/dt-bindings/sound/meson-g12a-tohdmitx.h new file mode 100644 index 0000000000..c5e1f48d30 --- /dev/null +++ b/include/dt-bindings/sound/meson-g12a-tohdmitx.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_MESON_G12A_TOHDMITX_H +#define __DT_MESON_G12A_TOHDMITX_H + +#define TOHDMITX_I2S_IN_A 0 +#define TOHDMITX_I2S_IN_B 1 +#define TOHDMITX_I2S_IN_C 2 +#define TOHDMITX_I2S_OUT 3 +#define TOHDMITX_SPDIF_IN_A 4 +#define TOHDMITX_SPDIF_IN_B 5 +#define TOHDMITX_SPDIF_OUT 6 + +#endif /* __DT_MESON_G12A_TOHDMITX_H */ diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index e55a4aec57..684a744f31 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -98,6 +98,10 @@ #define AB_SELECT "" #endif +#define FASTBOOT_CMD \ + "echo Booting into fastboot ...; " \ + "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " + #define DEFAULT_COMMON_BOOT_TI_ARGS \ "console=" CONSOLEDEV ",115200n8\0" \ "fdtfile=undefined\0" \ @@ -117,6 +121,28 @@ "setenv mmcroot /dev/mmcblk0p2 rw; " \ "run mmcboot;\0" \ "emmc_android_boot=" \ + "if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \ + CONTROL_PARTITION "; then " \ + "if bcb test command = bootonce-bootloader; then " \ + "echo BCB: Bootloader boot...; " \ + "bcb clear command; bcb store; " \ + FASTBOOT_CMD \ + "elif bcb test command = boot-recovery; then " \ + "echo BCB: Recovery boot...; " \ + "echo Warning: recovery is not implemented; " \ + "echo Performing normal boot for now...; " \ + "bcb clear command; bcb store; " \ + "run emmc_android_normal_boot; " \ + "else " \ + "echo BCB: Normal boot requested...; " \ + "run emmc_android_normal_boot; " \ + "fi; " \ + "else " \ + "echo Warning: BCB is corrupted or does not exist; " \ + "echo Performing normal boot...; " \ + "run emmc_android_normal_boot; " \ + "fi;\0" \ + "emmc_android_normal_boot=" \ "echo Trying to boot Android from eMMC ...; " \ "run update_to_fit; " \ "setenv eval_bootargs setenv bootargs $bootargs; " \ @@ -176,8 +202,7 @@ "if test ${dofastboot} -eq 1; then " \ "echo Boot fastboot requested, resetting dofastboot ...;" \ "setenv dofastboot 0; saveenv;" \ - "echo Booting into fastboot ...; " \ - "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \ + FASTBOOT_CMD \ "fi;" \ "if test ${boot_fit} -eq 1; then " \ "run update_to_fit;" \ diff --git a/include/fpga.h b/include/fpga.h index 51de5c55f8..ec5144334d 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -15,7 +15,7 @@ /* fpga_xxxx function return value definitions */ #define FPGA_SUCCESS 0 -#define FPGA_FAIL -1 +#define FPGA_FAIL 1 /* device numbers must be non-negative */ #define FPGA_INVALID_DEVICE -1 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 43a25e9c6a..02ff1a311a 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -8,6 +8,7 @@ */ #ifndef __LINUX_CLK_PROVIDER_H #define __LINUX_CLK_PROVIDER_H +#include <clk-uclass.h> static inline void clk_dm(ulong id, struct clk *clk) { @@ -66,6 +67,29 @@ struct clk_mux { }; #define to_clk_mux(_clk) container_of(_clk, struct clk_mux, clk) +extern const struct clk_ops clk_mux_ops; +u8 clk_mux_get_parent(struct clk *clk); + +struct clk_gate { + struct clk clk; + void __iomem *reg; + u8 bit_idx; + u8 flags; +#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) + u32 io_gate_val; +#endif +}; + +#define to_clk_gate(_clk) container_of(_clk, struct clk_gate, clk) + +#define CLK_GATE_SET_TO_DISABLE BIT(0) +#define CLK_GATE_HIWORD_MASK BIT(1) + +extern const struct clk_ops clk_gate_ops; +struct clk *clk_register_gate(struct device *dev, const char *name, + const char *parent_name, unsigned long flags, + void __iomem *reg, u8 bit_idx, + u8 clk_gate_flags, spinlock_t *lock); struct clk_div_table { unsigned int val; @@ -94,6 +118,11 @@ struct clk_divider { #define CLK_DIVIDER_ROUND_CLOSEST BIT(4) #define CLK_DIVIDER_READ_ONLY BIT(5) #define CLK_DIVIDER_MAX_AT_ZERO BIT(6) +extern const struct clk_ops clk_divider_ops; +unsigned long divider_recalc_rate(struct clk *hw, unsigned long parent_rate, + unsigned int val, + const struct clk_div_table *table, + unsigned long flags, unsigned long width); struct clk_fixed_factor { struct clk clk; @@ -104,6 +133,35 @@ struct clk_fixed_factor { #define to_clk_fixed_factor(_clk) container_of(_clk, struct clk_fixed_factor,\ clk) +struct clk_fixed_rate { + struct clk clk; + unsigned long fixed_rate; +}; + +#define to_clk_fixed_rate(dev) ((struct clk_fixed_rate *)dev_get_platdata(dev)) + +struct clk_composite { + struct clk clk; + struct clk_ops ops; + + struct clk *mux; + struct clk *rate; + struct clk *gate; + + const struct clk_ops *mux_ops; + const struct clk_ops *rate_ops; + const struct clk_ops *gate_ops; +}; + +#define to_clk_composite(_clk) container_of(_clk, struct clk_composite, clk) + +struct clk *clk_register_composite(struct device *dev, const char *name, + const char * const *parent_names, int num_parents, + struct clk *mux_clk, const struct clk_ops *mux_ops, + struct clk *rate_clk, const struct clk_ops *rate_ops, + struct clk *gate_clk, const struct clk_ops *gate_ops, + unsigned long flags); + int clk_register(struct clk *clk, const char *drv_name, const char *name, const char *parent_name); diff --git a/include/menu.h b/include/menu.h index fbff429c89..2d227c20bd 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,7 +19,20 @@ int menu_destroy(struct menu *m); void menu_display_statusline(struct menu *m); int menu_default_choice(struct menu *m, void **choice); -#if defined(CONFIG_MENU_SHOW) +/** + * menu_show() Show a boot menu + * + * This shows a menu and lets the user select an option. The menu is defined by + * environment variables (see README.bootmenu). + * + * This function doesn't normally return, but if the users requests the command + * problem, it will. + * + * @bootdelay: Delay to wait before running the default menu option (0 to run + * the entry immediately) + * @return If it returns, it always returns -1 to indicate that the boot should + * be aborted and the command prompt should be provided + */ int menu_show(int bootdelay); -#endif + #endif /* __MENU_H__ */ diff --git a/include/sandbox-clk.h b/include/sandbox-clk.h index 37c9838f76..f449de1364 100644 --- a/include/sandbox-clk.h +++ b/include/sandbox-clk.h @@ -19,6 +19,7 @@ enum { SANDBOX_CLK_ECSPI1, SANDBOX_CLK_USDHC1_SEL, SANDBOX_CLK_USDHC2_SEL, + SANDBOX_CLK_I2C, }; enum sandbox_pllv3_type { diff --git a/include/virtex2.h b/include/virtex2.h index a48113060e..7e8d93f24d 100644 --- a/include/virtex2.h +++ b/include/virtex2.h @@ -11,7 +11,7 @@ #include <xilinx.h> /* - * Slave SelectMap Implementation function table. + * Slave SelectMap or Serial Implementation function table. */ typedef struct { xilinx_pre_fn pre; @@ -24,18 +24,11 @@ typedef struct { xilinx_wr_fn wr; xilinx_rdata_fn rdata; xilinx_wdata_fn wdata; + xilinx_bwr_fn wbulkdata; xilinx_busy_fn busy; xilinx_abort_fn abort; xilinx_post_fn post; -} xilinx_virtex2_slave_selectmap_fns; - -/* Slave Serial Implementation function table */ -typedef struct { - xilinx_pgm_fn pgm; - xilinx_clk_fn clk; - xilinx_rdata_fn rdata; - xilinx_wdata_fn wdata; -} xilinx_virtex2_slave_serial_fns; +} xilinx_virtex2_slave_fns; #if defined(CONFIG_FPGA_VIRTEX2) extern struct xilinx_fpga_op virtex2_op; |