diff options
| -rw-r--r-- | arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch | 18 | ||||
| -rw-r--r-- | bsp/mti-malta64/mti-malta64.scc | 2 | ||||
| -rw-r--r-- | patches/misc/defconfigs-drop-obselete-options.patch | 56 |
3 files changed, 24 insertions, 52 deletions
diff --git a/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch index 44d92966..1c1d9408 100644 --- a/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch +++ b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch @@ -1,4 +1,4 @@ -From 8b05f6af70cc61956a8563a3bc79789dcffecfc5 Mon Sep 17 00:00:00 2001 +From 63911f5a1a7753ef0fb2a1b82fa268d7e13c3935 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Tue, 7 Jan 2020 03:34:12 +0000 Subject: [PATCH] mips: Kconfig: add QEMUMIPS64 option @@ -39,12 +39,12 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 797d7f1ad5fe..9337527d778f 100644 +index d89efba3d8a4..bc0d3e1cf297 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -92,6 +92,10 @@ config MIPS - select SYSCTL_EXCEPTION_TRACE - select VIRT_TO_BUS +@@ -118,6 +118,10 @@ config MACH_INGENIC + select CPU_SUPPORTS_CPUFREQ + select MIPS_EXTERNAL_TIMER +config QEMUMIPS64 + bool "Enable for qemumips64 specific configurations" @@ -53,7 +53,7 @@ index 797d7f1ad5fe..9337527d778f 100644 menu "Machine selection" choice -@@ -103,17 +107,17 @@ config MIPS_GENERIC +@@ -131,17 +135,17 @@ config MIPS_GENERIC_KERNEL select BOOT_RAW select BUILTIN_DTB select CEVT_R4K @@ -62,7 +62,7 @@ index 797d7f1ad5fe..9337527d778f 100644 select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_VI - select CSRC_R4K - select DMA_PERDEV_COHERENT + select DMA_NONCOHERENT select HAVE_PCI select IRQ_MIPS_CPU select MIPS_AUTO_PFN_OFFSET @@ -73,7 +73,7 @@ index 797d7f1ad5fe..9337527d778f 100644 select MIPS_L1_CACHE_SHIFT_7 select NO_EXCEPT_FILL select PCI_DRIVERS_GENERIC -@@ -535,9 +539,9 @@ config MIPS_MALTA +@@ -546,9 +550,9 @@ config MIPS_MALTA select BOOT_RAW select BUILTIN_DTB select CEVT_R4K @@ -82,7 +82,7 @@ index 797d7f1ad5fe..9337527d778f 100644 + select CSRC_R4K if !QEMUMIPS64 select COMMON_CLK - select CSRC_R4K - select DMA_MAYBE_COHERENT + select DMA_NONCOHERENT select GENERIC_ISA_DMA select HAVE_PCSPKR_PLATFORM -- diff --git a/bsp/mti-malta64/mti-malta64.scc b/bsp/mti-malta64/mti-malta64.scc index c1eaa82a..02a9533b 100644 --- a/bsp/mti-malta64/mti-malta64.scc +++ b/bsp/mti-malta64/mti-malta64.scc @@ -14,8 +14,6 @@ patch bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch patch bsp/mti-malta32/mousedev-mousedev-patch-for-qemumips.patch patch bsp/mti-malta32/Revert-Input-i8042-io-fix-up-region-handling-on-MIPS.patch -patch 0001-oprofile-mips-override-register-writes-for-qemu-mips.patch -patch oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch # v3.8+ kernels have broken mips ftrace function tracing, disable it for now include features/ftrace/ftrace-function-tracer-disable.scc diff --git a/patches/misc/defconfigs-drop-obselete-options.patch b/patches/misc/defconfigs-drop-obselete-options.patch index 63232ea5..ad492896 100644 --- a/patches/misc/defconfigs-drop-obselete-options.patch +++ b/patches/misc/defconfigs-drop-obselete-options.patch @@ -1,4 +1,4 @@ -From 6d036446096d4256a4800e387398c2fd5651597c Mon Sep 17 00:00:00 2001 +From 59220b096dbf3d5f595a15d9399abb04be1e8d0b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Mon, 10 Aug 2020 22:40:22 -0400 Subject: [PATCH] defconfigs: drop obselete options @@ -23,11 +23,9 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> arch/arm/configs/mxs_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/arm/configs/qcom_defconfig | 1 - - arch/arm/configs/sama5_defconfig | 1 - arch/arm/configs/socfpga_defconfig | 1 - arch/arm/configs/tegra_defconfig | 1 - - arch/arm64/configs/defconfig | 1 - - 14 files changed, 14 deletions(-) + 12 files changed, 12 deletions(-) diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig index 46075216ee6d..c731d4ade857 100644 @@ -66,7 +64,7 @@ index e70c997d5f4c..546afafa63fb 100644 CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig -index 221f5c340c86..cb0838b24d19 100644 +index 70928cc48939..2f57610f9ca5 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -98,7 +98,6 @@ CONFIG_MTD_CFI_AMDSTD=y @@ -78,10 +76,10 @@ index 221f5c340c86..cb0838b24d19 100644 CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig -index 84a3b055f253..ddf84146a277 100644 +index 33c917df7b32..081cd5fa2358 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig -@@ -121,7 +121,6 @@ CONFIG_MTD=y +@@ -120,7 +120,6 @@ CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PLATRAM=y @@ -90,10 +88,10 @@ index 84a3b055f253..ddf84146a277 100644 CONFIG_MTD_NAND_DAVINCI=y CONFIG_MTD_SPI_NOR=y diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig -index 226f2e97c6e2..18590973df12 100644 +index 4f16716bfc32..819ba7958528 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig -@@ -75,7 +75,6 @@ CONFIG_MTD_CFI_GEOMETRY=y +@@ -74,7 +74,6 @@ CONFIG_MTD_CFI_GEOMETRY=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_PHYSMAP=y @@ -114,7 +112,7 @@ index cddce57fe4b9..c8f4723d99c7 100644 CONFIG_MTD_NAND_MARVELL=y CONFIG_MTD_SPI_NOR=y diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig -index a9c6f32a9b1c..1322ebd3ccfd 100644 +index ca32446b187f..bd87306385ad 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -46,7 +46,6 @@ CONFIG_MTD=y @@ -126,10 +124,10 @@ index a9c6f32a9b1c..1322ebd3ccfd 100644 CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig -index 8654ece13004..50c90ad4605d 100644 +index bd7dd81c9c54..17cd2ffa61be 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig -@@ -179,7 +179,6 @@ CONFIG_MTD_RAM=m +@@ -178,7 +178,6 @@ CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PXA2XX=m @@ -138,10 +136,10 @@ index 8654ece13004..50c90ad4605d 100644 CONFIG_MTD_DOCG3=m CONFIG_MTD_RAW_NAND=m diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index d6733e745b80..3c2c89a3d510 100644 +index 3f36887e8333..6b013d67e3cf 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig -@@ -62,7 +62,6 @@ CONFIG_DEVTMPFS=y +@@ -61,7 +61,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y @@ -149,23 +147,11 @@ index d6733e745b80..3c2c89a3d510 100644 CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_QCOM=y CONFIG_MTD_SPI_NOR=y -diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig -index 5f6297e6c549..9fbcf1a6af8d 100644 ---- a/arch/arm/configs/sama5_defconfig -+++ b/arch/arm/configs/sama5_defconfig -@@ -68,7 +68,6 @@ CONFIG_MTD=y - CONFIG_MTD_CMDLINE_PARTS=y - CONFIG_MTD_BLOCK=y - CONFIG_MTD_CFI=y --CONFIG_MTD_M25P80=y - CONFIG_MTD_RAW_NAND=y - CONFIG_MTD_NAND_ATMEL=y - CONFIG_MTD_SPI_NOR=y diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig -index e73c97b0f5b0..04c8bd301a72 100644 +index 0c60eb382c80..e88865fc7eee 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig -@@ -48,7 +48,6 @@ CONFIG_DEVTMPFS=y +@@ -47,7 +47,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y @@ -174,7 +160,7 @@ index e73c97b0f5b0..04c8bd301a72 100644 CONFIG_MTD_NAND_DENALI_DT=y CONFIG_MTD_SPI_NOR=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig -index 74739a52a8ad..dee785958da0 100644 +index 13ef3e4dcbb7..0fa4a025abdd 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -86,7 +86,6 @@ CONFIG_DEVTMPFS=y @@ -185,18 +171,6 @@ index 74739a52a8ad..dee785958da0 100644 CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_AD525X_DPOT=y -diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 838301650a79..9fac27a0eb62 100644 ---- a/arch/arm64/configs/defconfig -+++ b/arch/arm64/configs/defconfig -@@ -796,7 +796,6 @@ CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_TYPEC=m - CONFIG_TYPEC_TCPM=m - CONFIG_TYPEC_FUSB302=m --CONFIG_TYPEC_HD3SS3220=m - CONFIG_TYPEC_TPS6598X=m - CONFIG_MMC=y - CONFIG_MMC_BLOCK_MINORS=32 -- 2.19.1 |