webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel: armv5tel remove "-multi" config

Browse Source 
we have only this kernel left so remove the extension

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2021-06-10 13:36:45 +00:00
parent 09951f8b0f
commit efafef1663
14 changed files with 22843 additions and 22861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
config/kernel/kernel.config.armv5tel-ipfire-multi → config/kernel/kernel.config.armv5tel-ipfire
View File

22828
config/rootfiles/common/armv5tel/linux Normal file
View File

File diff suppressed because it is too large Load Diff

1
config/rootfiles/common/armv5tel/linux-initrd Normal file
View File

@@ -0,0 +1 @@
boot/uInit-KVER-ipfire

1
config/rootfiles/common/armv5tel/linux-initrd-multi
View File

@@ -1 +0,0 @@
boot/uInit-KVER-ipfire-multi

22828
config/rootfiles/common/armv5tel/linux-multi
View File

File diff suppressed because it is too large Load Diff

1
config/rootfiles/core/kerneltest/filelists/armv5tel/linux Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux

1
config/rootfiles/core/kerneltest/filelists/armv5tel/linux-initrd Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-initrd

1
config/rootfiles/core/kerneltest/filelists/armv5tel/linux-initrd-multi
View File

@@ -1 +0,0 @@
../../../../common/armv5tel/linux-initrd-multi

1
config/rootfiles/core/kerneltest/filelists/armv5tel/linux-multi
View File

@@ -1 +0,0 @@
../../../../common/armv5tel/linux-multi

6
config/u-boot/boot.cmd
View File

@@ -11,12 +11,6 @@ if test ${boot_part} = ""; then
setenv boot_part ${dev_num}:1; setenv boot_part ${dev_num}:1;
fi; fi;
if test ${cpu} = "armv8"; then
echo ;
else
setenv kernel_type -multi;
fi;
# Import uEnv txt... # Import uEnv txt...
if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
echo Load uEnv.txt...; echo Load uEnv.txt...;

BIN
config/u-boot/boot.scr
View File

Binary file not shown.

5
lfs/linux
View File

@@ -66,9 +66,6 @@ endif
ifeq "$(KCFG)" "" ifeq "$(KCFG)" ""
LASTKERNEL=1 LASTKERNEL=1
endif endif
ifeq "$(KCFG)" "-multi"
LASTKERNEL=1
endif
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
@@ -140,7 +137,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# fix Boot with enabled usercopy hardening # fix Boot with enabled usercopy hardening
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.9-crypto_testmgr_allocate_buffers_with____GFP_COMP.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.9-crypto_testmgr_allocate_buffers_with____GFP_COMP.patch
ifeq "$(KCFG)" "-multi" ifeq "$(BUILD_ARCH)" "armv5tel"
# Apply Arm-multiarch kernel patches. # Apply Arm-multiarch kernel patches.
cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
endif endif

2
lfs/linux-initrd
View File

@@ -60,7 +60,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Create initramfs images # Create initramfs images
dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
ifeq "$(KCFG)" "-multi" ifeq "$(BUILD_ARCH)" "armv5tel"
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX) cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
endif endif

29
make.sh
View File

@@ -1193,25 +1193,16 @@ buildipfire() {
lfsmake2 screen lfsmake2 screen
lfsmake2 elfutils lfsmake2 elfutils
case "${BUILD_ARCH}" in # Kernelbuild ... current we have no platform that need
x86_64|i586|aarch64) # multi kernel builds so KCFG is empty
lfsmake2 linux KCFG="" lfsmake2 linux KCFG=""
lfsmake2 rtl8189es KCFG="" lfsmake2 rtl8189es KCFG=""
lfsmake2 rtl8812au KCFG="" lfsmake2 rtl8812au KCFG=""
lfsmake2 xtables-addons KCFG="" lfsmake2 xradio KCFG=""
lfsmake2 linux-initrd KCFG="" lfsmake2 xtables-addons KCFG=""
;; lfsmake2 linux-initrd KCFG=""
armv5tel)
# arm multi platform (Panda, Wandboard ...) kernel build lfsmake2 xtables-addons USPACE="1"
lfsmake2 linux KCFG="-multi"
lfsmake2 rtl8189es KCFG="-multi"
lfsmake2 rtl8812au KCFG="-multi"
lfsmake2 xradio KCFG="-multi"
lfsmake2 xtables-addons KCFG="-multi"
lfsmake2 linux-initrd KCFG="-multi"
;;
esac
lfsmake2 xtables-addons USPACE="1"
lfsmake2 libgpg-error lfsmake2 libgpg-error
lfsmake2 libgcrypt lfsmake2 libgcrypt
lfsmake2 libassuan lfsmake2 libassuan