diff mbox series

[SRU,K:raspi] UBUNTU: [Packaging] raspi: Remove raspi-nolpae armhf flavor

Message ID 20230613080300.30604-5-juerg.haefliger@canonical.com
State New
Headers show
Series [SRU,K:raspi] UBUNTU: [Packaging] raspi: Remove raspi-nolpae armhf flavor | expand

Commit Message

Juerg Haefliger June 13, 2023, 8:02 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2023359

The early 5.4 armhf LPAE kernels were broken and consumed ~70MB of
additional memory on Pi 3 and 2. For that we introduced the raspi-nolpae
flavor. The kernel has been fixed a while ago by commit fcf044891c84
("ARM: Qualify enabling of swiotlb_init()") so let's get rid of the
inofficial raspi-nolpae armhf flavor.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian.raspi/config/annotations                      | 12 ++++++------
 debian.raspi/config/arm64/config.common.arm64        |  1 -
 debian.raspi/config/armhf/config.common.armhf        |  2 ++
 debian.raspi/config/armhf/config.flavour.raspi       |  8 --------
 .../config/armhf/config.flavour.raspi-nolpae         | 11 -----------
 debian.raspi/config/config.common.ubuntu             | 11 ++++++-----
 debian.raspi/etc/getabis                             |  2 +-
 debian.raspi/rules.d/armhf.mk                        |  2 +-
 8 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 debian.raspi/config/armhf/config.flavour.raspi-nolpae
diff mbox series

Patch

diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index 981a5d1f21b1..10a2dda76abe 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -20,8 +20,8 @@  CONFIG_MFD_RASPBERRYPI_POE_HAT			policy<{'*': 'm'}> mark<ENFORCED> note<LP: #195
 
 CONFIG_KFENCE_STATIC_KEYS			policy<{'*': '-'}> mark<ENFORCED> note<LP: #1948038>
 
-CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
-CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
+CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y'}> mark<ENFORCED> note<LP: #1933627>
+CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y'}> mark<ENFORCED> note<LP: #1933627>
 
 CONFIG_MFD_TPS65217				policy<{'*': 'm'}> mark<ENFORCED> note<not a boot essential for raspi>
 CONFIG_SAMPLE_TRACE_PRINTK			policy<{'*': '-'}> mark<ENFORCED> note<not available due to SAMPLES=n>
@@ -36,10 +36,10 @@  CONFIG_MEDIA_CEC_RC				policy<{'*': 'y'}> mark<ENFORCED> note<LP: #1916721>
 
 CONFIG_HIBERNATION				policy<{'arm64': 'n', 'armhf': 'n'}> mark<ENFORCED> note<LP: #1914009>
 
-CONFIG_ARM_LPAE					policy<{'arm64': '-', 'armhf': 'y', 'armhf-raspi-nolpae': 'n'}> mark<ENFORCED> note<LP: #1896761>
-CONFIG_HIGHMEM					policy<{'arm64': '-', 'armhf': 'y', 'armhf-raspi-nolpae': 'n'}> mark<ENFORCED> note<LP: #1896761>
-CONFIG_VMSPLIT_3G				policy<{'arm64': '-', 'armhf': 'y', 'armhf-raspi-nolpae': 'n'}> mark<ENFORCED> note<LP: #1896761>
-CONFIG_VMSPLIT_2G				policy<{'arm64': '-', 'armhf': 'n', 'armhf-raspi-nolpae': 'y'}> mark<ENFORCED> note<LP: #1896761>
+CONFIG_ARM_LPAE					policy<{'arm64': '-', 'armhf': 'y'}> mark<ENFORCED> note<LP: #1896761>
+CONFIG_HIGHMEM					policy<{'arm64': '-', 'armhf': 'y'}> mark<ENFORCED> note<LP: #1896761>
+CONFIG_VMSPLIT_3G				policy<{'arm64': '-', 'armhf': 'y'}> mark<ENFORCED> note<LP: #1896761>
+CONFIG_VMSPLIT_2G				policy<{'arm64': '-', 'armhf': 'n'}> mark<ENFORCED> note<LP: #1896761>
 
 CONFIG_VIDEO_IRS1125				policy<{'arm64': 'm', 'armhf': 'm'}> mark<ENFORCED> note<LP: #1893779>
 
diff --git a/debian.raspi/config/arm64/config.common.arm64 b/debian.raspi/config/arm64/config.common.arm64
index 181771d19ed8..b90bb649d131 100644
--- a/debian.raspi/config/arm64/config.common.arm64
+++ b/debian.raspi/config/arm64/config.common.arm64
@@ -19,7 +19,6 @@  CONFIG_PARAVIRT=y
 CONFIG_PCCARD=m
 CONFIG_PGTABLE_LEVELS=4
 # CONFIG_PSTORE_CONSOLE is not set
-CONFIG_RESET_RASPBERRYPI=y
 CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_USB_HCD_BCMA=m
diff --git a/debian.raspi/config/armhf/config.common.armhf b/debian.raspi/config/armhf/config.common.armhf
index 003803d14c2f..5ee261838c5d 100644
--- a/debian.raspi/config/armhf/config.common.armhf
+++ b/debian.raspi/config/armhf/config.common.armhf
@@ -2,6 +2,7 @@ 
 # Config options for config.common.armhf automatically generated by splitconfig.pl
 #
 CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0"
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
@@ -16,6 +17,7 @@  CONFIG_NR_CPUS=4
 CONFIG_PAGE_EXTENSION=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PCCARD is not set
+CONFIG_PGTABLE_LEVELS=3
 CONFIG_PSTORE_CONSOLE=y
 # CONFIG_SERIAL_8250_FINTEK is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
diff --git a/debian.raspi/config/armhf/config.flavour.raspi b/debian.raspi/config/armhf/config.flavour.raspi
index 55bdcaec3bce..b5067dfa6252 100644
--- a/debian.raspi/config/armhf/config.flavour.raspi
+++ b/debian.raspi/config/armhf/config.flavour.raspi
@@ -1,11 +1,3 @@ 
 #
 # Config options for config.flavour.raspi automatically generated by splitconfig.pl
 #
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARM_LPAE=y
-CONFIG_HIGHMEM=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_RESET_RASPBERRYPI=y
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
diff --git a/debian.raspi/config/armhf/config.flavour.raspi-nolpae b/debian.raspi/config/armhf/config.flavour.raspi-nolpae
deleted file mode 100644
index 95e5b89bcdca..000000000000
--- a/debian.raspi/config/armhf/config.flavour.raspi-nolpae
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#
-# Config options for config.flavour.raspi-nolpae automatically generated by splitconfig.pl
-#
-CONFIG_ARCH_MMAP_RND_BITS_MAX=15
-# CONFIG_ARM_LPAE is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_PGTABLE_LEVELS=2
-# CONFIG_RESET_RASPBERRYPI is not set
-CONFIG_VMSPLIT_2G=y
-# CONFIG_VMSPLIT_3G is not set
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 05b473f2d780..9796c8ba0707 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -526,6 +526,7 @@  CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_LPAE=y
 CONFIG_ARM_MHU=m
 CONFIG_ARM_MHU_V2=m
 CONFIG_ARM_MODULE_PLTS=y
@@ -1560,7 +1561,6 @@  CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_SPECTRE=y
-CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
@@ -1671,8 +1671,6 @@  CONFIG_CRYPTO_DEV_CCP_DD=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
@@ -3286,6 +3284,7 @@  CONFIG_HID_XIAOMI=m
 CONFIG_HID_XINMO=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
+CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HINIC is not set
@@ -5814,6 +5813,7 @@  CONFIG_PACKING=y
 CONFIG_PADATA=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_OWNER is not set
 CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POOL=y
@@ -6482,6 +6482,7 @@  CONFIG_REMOTEPROC_CDEV=y
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_RASPBERRYPI=y
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RETU_WATCHDOG=m
@@ -8503,7 +8504,6 @@  CONFIG_USB_FOTG210_HCD=m
 # CONFIG_USB_FOTG210_UDC is not set
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FUSB300 is not set
 CONFIG_USB_F_ACM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_EEM=m
@@ -9131,7 +9131,8 @@  CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLINUX_MAP=y
 # CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+CONFIG_VMSPLIT_3G=y
 # CONFIG_VMWARE_VMCI is not set
 CONFIG_VMXNET3=m
 CONFIG_VM_EVENT_COUNTERS=y
diff --git a/debian.raspi/etc/getabis b/debian.raspi/etc/getabis
index c03e2d965ee6..0397645820af 100644
--- a/debian.raspi/etc/getabis
+++ b/debian.raspi/etc/getabis
@@ -11,5 +11,5 @@  repo_list=(
 	"http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu/pool/main/l/linux-raspi-unstable"
 )
 
-getall armhf raspi raspi-nolpae
+getall armhf raspi
 getall arm64 raspi
diff --git a/debian.raspi/rules.d/armhf.mk b/debian.raspi/rules.d/armhf.mk
index e59ac3db10b7..69acf569bc46 100644
--- a/debian.raspi/rules.d/armhf.mk
+++ b/debian.raspi/rules.d/armhf.mk
@@ -2,7 +2,7 @@  human_arch		= ARM (hard float)
 build_arch		= arm
 header_arch		= arm
 defconfig		= defconfig
-flavours		= raspi raspi-nolpae
+flavours		= raspi
 build_image		= zImage
 kernel_file		= arch/$(build_arch)/boot/zImage
 install_file		= vmlinuz