From 119d453c0b40d4a477781626f944d74d439956da Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 2 Jun 2020 09:57:56 +0200 Subject: restart: give all restart handlers a descriptive name With incoming changes to choose a specific reset method, give all currently unnamed "default" reset handlers a name: - soc reset via SoC-specific means - soc-wdt reset via SoC watchdog timer - vector reset via jump to reset vector - efi reset via EFI firmware Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/kvx/cpu/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/kvx') diff --git a/arch/kvx/cpu/reset.c b/arch/kvx/cpu/reset.c index c7f2018e00..df36764cb6 100644 --- a/arch/kvx/cpu/reset.c +++ b/arch/kvx/cpu/reset.c @@ -60,7 +60,7 @@ static int kvx_reset_init(void) break; } - restart_handler_register_fn(kvx_restart_soc); + restart_handler_register_fn("soc", kvx_restart_soc); return 0; } -- cgit v1.2.3 From 568130f6efb9b5bb20aea3742a42bfa956186479 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 18 Sep 2020 13:04:41 +0200 Subject: Regenerate defconfig files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done with the same script used to generate commit d952a0eeba37 ("Regenerate defconfig files"). Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- arch/arm/configs/at91sam9263ek_defconfig | 1 - arch/arm/configs/at91sam9x5ek_defconfig | 1 - arch/arm/configs/freescale-mx21-ads_defconfig | 1 - arch/arm/configs/imx_defconfig | 1 - arch/arm/configs/imx_v8_defconfig | 2 -- arch/arm/configs/kindle-mx50_defconfig | 1 - arch/arm/configs/layerscape_defconfig | 2 -- arch/arm/configs/microchip_ksz9477_evb_defconfig | 1 - arch/arm/configs/socfpga-arria10_defconfig | 1 - arch/arm/configs/virt2real_defconfig | 1 - arch/arm/configs/zii_vf610_dev_defconfig | 1 - arch/kvx/configs/generic_defconfig | 12 +++++------- arch/mips/configs/bcm47xx_defconfig | 1 - arch/mips/configs/qemu-malta_defconfig | 1 - arch/x86/configs/efi_defconfig | 1 - 15 files changed, 5 insertions(+), 23 deletions(-) (limited to 'arch/kvx') diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index 45c6f79de4..0cde5396af 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -1,4 +1,3 @@ -CONFIG_ARCH_AT91SAM9263=y CONFIG_AT91_MULTI_BOARDS=y CONFIG_MACH_AT91SAM9263EK=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000 diff --git a/arch/arm/configs/at91sam9x5ek_defconfig b/arch/arm/configs/at91sam9x5ek_defconfig index 11d1e4511e..7b743abfaa 100644 --- a/arch/arm/configs/at91sam9x5ek_defconfig +++ b/arch/arm/configs/at91sam9x5ek_defconfig @@ -1,4 +1,3 @@ -CONFIG_ARCH_AT91SAM9X5=y CONFIG_AT91_MULTI_BOARDS=y CONFIG_MACH_AT91SAM9X5EK=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000 diff --git a/arch/arm/configs/freescale-mx21-ads_defconfig b/arch/arm/configs/freescale-mx21-ads_defconfig index e1843db3e2..b1d37f76a8 100644 --- a/arch/arm/configs/freescale-mx21-ads_defconfig +++ b/arch/arm/configs/freescale-mx21-ads_defconfig @@ -1,6 +1,5 @@ CONFIG_TEXT_BASE=0xc3000000 CONFIG_ARCH_IMX=y -CONFIG_MACH_IMX21ADS=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MALLOC_SIZE=0x2000000 CONFIG_CMDLINE_EDITING=y diff --git a/arch/arm/configs/imx_defconfig b/arch/arm/configs/imx_defconfig index 02e33e122e..e6333220b6 100644 --- a/arch/arm/configs/imx_defconfig +++ b/arch/arm/configs/imx_defconfig @@ -13,7 +13,6 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_PANIC_HANG=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y diff --git a/arch/arm/configs/imx_v8_defconfig b/arch/arm/configs/imx_v8_defconfig index 7e3bfadd9e..a7e890ee99 100644 --- a/arch/arm/configs/imx_v8_defconfig +++ b/arch/arm/configs/imx_v8_defconfig @@ -10,7 +10,6 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y @@ -129,7 +128,6 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_GENERIC_PHY=y CONFIG_USB_NOP_XCEIV=y -CONFIG_PHY_FSL_IMX8MQ_USB=y CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y diff --git a/arch/arm/configs/kindle-mx50_defconfig b/arch/arm/configs/kindle-mx50_defconfig index 552b2d6d33..95fafd56e6 100644 --- a/arch/arm/configs/kindle-mx50_defconfig +++ b/arch/arm/configs/kindle-mx50_defconfig @@ -9,7 +9,6 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/arm/configs/layerscape_defconfig b/arch/arm/configs/layerscape_defconfig index b36f1944ec..394cd95c98 100644 --- a/arch/arm/configs/layerscape_defconfig +++ b/arch/arm/configs/layerscape_defconfig @@ -78,7 +78,6 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_NET_FSL_FMAN=y @@ -105,7 +104,6 @@ CONFIG_EEPROM_AT24=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_IMX=y CONFIG_GPIO_PCA953X=y -CONFIG_NVMEM=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y CONFIG_FS_EXT4=y diff --git a/arch/arm/configs/microchip_ksz9477_evb_defconfig b/arch/arm/configs/microchip_ksz9477_evb_defconfig index 4189b2c039..7130499490 100644 --- a/arch/arm/configs/microchip_ksz9477_evb_defconfig +++ b/arch/arm/configs/microchip_ksz9477_evb_defconfig @@ -1,4 +1,3 @@ -CONFIG_ARCH_SAMA5D3=y CONFIG_AT91_MULTI_BOARDS=y CONFIG_MACH_MICROCHIP_KSZ9477_EVB=y CONFIG_AEABI=y diff --git a/arch/arm/configs/socfpga-arria10_defconfig b/arch/arm/configs/socfpga-arria10_defconfig index e47a0ab183..a37bae6217 100644 --- a/arch/arm/configs/socfpga-arria10_defconfig +++ b/arch/arm/configs/socfpga-arria10_defconfig @@ -18,7 +18,6 @@ CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y CONFIG_DEFAULT_COMPRESSION_LZO=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_POLLER=y CONFIG_STATE=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y diff --git a/arch/arm/configs/virt2real_defconfig b/arch/arm/configs/virt2real_defconfig index 814fe69e42..62315b8cb3 100644 --- a/arch/arm/configs/virt2real_defconfig +++ b/arch/arm/configs/virt2real_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_LED=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y -CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/zii_vf610_dev_defconfig b/arch/arm/configs/zii_vf610_dev_defconfig index 45c24d6df4..3ed5d37458 100644 --- a/arch/arm/configs/zii_vf610_dev_defconfig +++ b/arch/arm/configs/zii_vf610_dev_defconfig @@ -8,7 +8,6 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y diff --git a/arch/kvx/configs/generic_defconfig b/arch/kvx/configs/generic_defconfig index 8162171741..0d971ff3d5 100644 --- a/arch/kvx/configs/generic_defconfig +++ b/arch/kvx/configs/generic_defconfig @@ -1,15 +1,13 @@ CONFIG_AUTO_COMPLETE=y -CONFIG_BAUDRATE=115200 -CONFIG_CLOCKSOURCE_KVX=y +CONFIG_CONSOLE_RATP=y CONFIG_CMD_BOOT=y -CONFIG_CMD_BOOTM=y +CONFIG_CMD_RESET=y CONFIG_CMD_CMP=y -CONFIG_CMD_OF_DUMP=y CONFIG_CMD_POWEROFF=y -CONFIG_CMD_RESET=y CONFIG_CMD_WD=y -CONFIG_CONSOLE_RATP=y +CONFIG_CMD_OF_DUMP=y CONFIG_DRIVER_SERIAL_NS16550=y -CONFIG_PINCTRL_SINGLE=y +CONFIG_CLOCKSOURCE_KVX=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_KVX=y +CONFIG_PINCTRL_SINGLE=y diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig index 0cd0e9e650..9cf172a70e 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig @@ -9,7 +9,6 @@ CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set -CONFIG_POLLER=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig index 2465c0260d..ac0577c217 100644 --- a/arch/mips/configs/qemu-malta_defconfig +++ b/arch/mips/configs/qemu-malta_defconfig @@ -12,7 +12,6 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_POLLER=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig index 47842d10af..99bc39eaa6 100644 --- a/arch/x86/configs/efi_defconfig +++ b/arch/x86/configs/efi_defconfig @@ -14,7 +14,6 @@ CONFIG_BLSPEC=y CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_PARTITION_DISK_EFI=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_POLLER=y CONFIG_STATE=y CONFIG_DEBUG_LL=y CONFIG_LONGHELP=y -- cgit v1.2.3