apm821xx: disable and move kernel CONFIG_ symbols

try to reduce the kernel size by disabling and moving
options from the common kernel configuration to the
SATA target that doesn't have the constraints.

For NAND this has become necessary because as with 5.10
some devices outgrew their kernels. Though, in my tests
this didn't help much: just a smidgen over 100kib was
saved on the  uncompressed kernel.

... running make kernel_oldconfig also removed some
other config symbols, mostly those that already set
from elsewhere or became obsolete in the meantime.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

2 files changed, 17 insertions, 31 deletions

diff --git a/target/linux/apm821xx/config-5.10 b/target/linux/apm821xx/config-5.10
index bb9753d0b4..22d34c3fce 100644
--- a/target/linux/apm821xx/config-5.10
+++ b/target/linux/apm821xx/config-5.10
@@ -25,7 +25,6 @@ CONFIG_AUDIT_ARCH=y
 # CONFIG_BAMBOO is not set
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
 CONFIG_BLUESTONE=y
 CONFIG_BOOKE=y
 CONFIG_BOOKE_WDT=y
@@ -40,33 +39,20 @@ CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DEV_PPC4XX=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ESSIV=y
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MD5_PPC=y
+# CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA1_PPC=y
-CONFIG_CRYPTO_SHA256=y
+# CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_DATA_SHIFT=12
-CONFIG_DEBUG_MISC=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_ENGINE=y
@@ -84,9 +70,7 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EXTRA_TARGETS="uImage"
 CONFIG_FIXED_PHY=y
 CONFIG_FORCE_PCI=y
-CONFIG_FREEZER=y
 # CONFIG_FSL_LBC is not set
-CONFIG_FW_CACHE=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ATOMIC64=y
@@ -184,7 +168,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PME=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_MSI=y
@@ -195,18 +178,10 @@ CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_64BIT=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PM=y
 # CONFIG_PMU_SYSFS is not set
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_CLK=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_PPC44x_SIMPLE=y
-CONFIG_PPC4xx_CPM=y
 CONFIG_PPC4xx_GPIO=y
 CONFIG_PPC4xx_MSI=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
@@ -242,16 +217,12 @@ CONFIG_RSEQ=y
 # CONFIG_SAM440EP is not set
 # CONFIG_SCOM_DEBUGFS is not set
 # CONFIG_SEQUOIA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SRCU=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
 CONFIG_SWPHY=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 # CONFIG_TAISHAN is not set
diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default
index 9a0a8179cc..e8e595641d 100644
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@@ -9,10 +9,15 @@ CONFIG_SATA_PMP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_SATA_DWC=y
 # CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_CRYPTO_MD5_PPC=y
+CONFIG_CRYPTO_SHA1_PPC=y
 CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
+CONFIG_FREEZER=y
+CONFIG_FW_CACHE=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_PM=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -30,9 +35,19 @@ CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 # CONFIG_MD_RAID10 is not set
 # CONFIG_MD_RAID456 is not set
+CONFIG_PM=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_CLK=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
 CONFIG_PPC_EARLY_DEBUG=y
 CONFIG_PPC_EARLY_DEBUG_44x=y
 # CONFIG_PPC_EARLY_DEBUG_MEMCONS is not set
 CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x4
 CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
+CONFIG_PPC4xx_CPM=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y