From: Olof Johansson <olof@lixom.net>
Date: Thu, 27 Jun 2019 02:27:25 +0000 (-0700)
Subject: Merge tag 'samsung-defconfig-5.3' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a151f27537250cf869c8d1c2549ccbb77dcbec2f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'samsung-defconfig-5.3' of https://git./linux/kernel/git/krzk/linux into arm/defconfig

Samsung defconfig changes for v5.3

1. Trim several configs with savedefconfig.
2. Enable Lima and Panfrost drivers for Mali GPU.

* tag 'samsung-defconfig-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Enable Panfrost and Lima drivers
  ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers
  ARM: defconfig: samsung: Cleanup with savedefconfig
  ARM: exynos_defconfig: Trim and reorganize with savedefconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
---

a151f27537250cf869c8d1c2549ccbb77dcbec2f
diff --cc arch/arm/configs/s3c2410_defconfig
index addc209ebd3d,b697e9af84f9..95b5a4ffddea
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@@ -181,10 -178,11 +178,10 @@@ CONFIG_CFG80211=
  CONFIG_MAC80211=m
  CONFIG_MAC80211_MESH=y
  CONFIG_MAC80211_LEDS=y
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_MTD=y
+ CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_REDBOOT_PARTS=y
  CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
- CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
  CONFIG_MTD_JEDECPROBE=y
diff --cc arch/arm/configs/s3c6400_defconfig
index 6eea99300f7f,34f9992ce8e9..59a258d504aa
--- a/arch/arm/configs/s3c6400_defconfig
+++ b/arch/arm/configs/s3c6400_defconfig
@@@ -18,9 -15,12 +15,11 @@@ CONFIG_MACH_HMT=
  CONFIG_MACH_SMARTQ5=y
  CONFIG_MACH_SMARTQ7=y
  CONFIG_MACH_WLF_CRAGG_6410=y
- CONFIG_AEABI=y
  CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"
  CONFIG_VFP=y
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ # CONFIG_BLK_DEV_BSG is not set
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
  CONFIG_MTD_NAND_S3C2410=y