diff --git a/build-kernel.sh b/build-kernel.sh index 4897b6e64..1f2336b83 100755 --- a/build-kernel.sh +++ b/build-kernel.sh @@ -111,61 +111,51 @@ case "$BOARD" in cp4b-skh) cfg="coolpi_linux_defconfig" dtb="rk3588s-cp4-skh.dtb" - txt_config_file="config_cp4b.txt" txt_extconf_file="extlinux_cp4b.conf" ;; cp4b-hdmi-in) cfg="rk3588s_cp4b_defconfig" dtb="rk3588s-cp4-hdmi-in.dtb" - txt_config_file="config_cp4b_hdmi_in.txt" txt_extconf_file="extlinux_cp4b_hdmi_in.conf" ;; cm5-evb) cfg="rk3588_cpcm5_evb_defconfig" dtb="rk3588-cpcm5-evb.dtb" - txt_config_file="config_cpcm5_evb.txt" txt_extconf_file="extlinux_cpcm5_evb.conf" ;; cm5-evb-v11) cfg="rk3588_cpcm5_evb_defconfig" dtb="rk3588-cpcm5-evb-v11.dtb" - txt_config_file="config_cpcm5_evb_v11.txt" txt_extconf_file="extlinux_cpcm5_evb_v11.conf" ;; cm5-minipc) cfg="rk3588_cpcm5_minipc_defconfig" dtb="rk3588-cpcm5-minipc.dtb" - txt_config_file="config_cpcm5_minipc.txt" txt_extconf_file="extlinux_cpcm5_minipc.conf" ;; cm5-notebook) cfg="rk3588_cpcm5_notebook_defconfig" dtb="rk3588-cpcm5-notebook.dtb" - txt_config_file="config_cpcm5_notebook.txt" txt_extconf_file="extlinux_cpcm5_notebook.conf" ;; cm5-genbook) cfg="rk3588_cpcm5_genbook_defconfig" dtb="rk3588-cpcm5-genbook.dtb" - txt_config_file="config_cpcm5_genbook.txt" txt_extconf_file="extlinux_cpcm5_genbook.conf" ;; cm5-8uart) cfg="rk3588_cpcm5_defconfig" dtb="rk3588-cpcm5-8uart.dtb" - txt_config_file="config_cpcm5_8uart.txt" txt_extconf_file="extlinux_cpcm5_8uart.conf" ;; cm5-lz) cfg="rk3588_cpcm5_lz_defconfig" dtb="rk3588-cpcm5-lz.dtb" - txt_config_file="config_cpcm5_lz.txt" txt_extconf_file="extlinux_cpcm5_lz.conf" ;; cpnano) cfg="rv1106_cpnano_defconfig" dtb="rv1106-cpnano.dtb" - txt_config_file="config_cpnano.txt" txt_extconf_file="extlinux_cpnano.conf" RV1106="1" export ARCH=arm @@ -206,10 +196,6 @@ if [ "$RV1106" == "1" ]; then make ARCH=arm modules_install INSTALL_MOD_PATH=out_modules rm -rf out mkdir -p out/extlinux - cp vmlinuz out/ - #cp demo-cfgs/cmdline.txt out/cmdline.txt - #cp demo-cfgs/$txt_config_file out/config.txt - cp demo-cfgs/$txt_extconf_file out/extlinux/extlinux.conf else make ARCH=arm64 LOCALVERSION= $cfg make ARCH=arm64 LOCALVERSION= -j8 @@ -233,8 +219,6 @@ else mkdir -p out/extlinux cp vmlinuz out/ cp Image out/ - cp demo-cfgs/cmdline.txt out/cmdline.txt - cp demo-cfgs/$txt_config_file out/config.txt cp demo-cfgs/$txt_extconf_file out/extlinux/extlinux.conf fi diff --git a/demo-cfgs/cmdline.txt b/demo-cfgs/cmdline.txt deleted file mode 100755 index 2d35810e8..000000000 --- a/demo-cfgs/cmdline.txt +++ /dev/null @@ -1 +0,0 @@ -root=LABEL=writable rw rootfstype=ext4 console=ttyS0,115200n81 quiet splash plymouth.ignore-serial-consoles vt.global_cursor_default=1 irqchip.gicv3_pseudo_nmi=0 net.ifnames=0 diff --git a/demo-cfgs/config_cp4b.txt b/demo-cfgs/config_cp4b.txt deleted file mode 100755 index 60f284876..000000000 --- a/demo-cfgs/config_cp4b.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588s-cp4.dtb - diff --git a/demo-cfgs/config_cpcm5_8uart.txt b/demo-cfgs/config_cpcm5_8uart.txt deleted file mode 100755 index cac433a2a..000000000 --- a/demo-cfgs/config_cpcm5_8uart.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-8uart.dtb - diff --git a/demo-cfgs/config_cpcm5_evb.txt b/demo-cfgs/config_cpcm5_evb.txt deleted file mode 100755 index c1c5e21f5..000000000 --- a/demo-cfgs/config_cpcm5_evb.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-evb.dtb - diff --git a/demo-cfgs/config_cpcm5_evb_v11.txt b/demo-cfgs/config_cpcm5_evb_v11.txt deleted file mode 100755 index 9dd355201..000000000 --- a/demo-cfgs/config_cpcm5_evb_v11.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-evb-v11.dtb - diff --git a/demo-cfgs/config_cpcm5_genbook.txt b/demo-cfgs/config_cpcm5_genbook.txt deleted file mode 100755 index 226aa8454..000000000 --- a/demo-cfgs/config_cpcm5_genbook.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-genbook.dtb - diff --git a/demo-cfgs/config_cpcm5_lz.txt b/demo-cfgs/config_cpcm5_lz.txt deleted file mode 100755 index 7b4f372a6..000000000 --- a/demo-cfgs/config_cpcm5_lz.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-lz.dtb - diff --git a/demo-cfgs/config_cpcm5_minipc.txt b/demo-cfgs/config_cpcm5_minipc.txt deleted file mode 100755 index a25314063..000000000 --- a/demo-cfgs/config_cpcm5_minipc.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-minipc.dtb - diff --git a/demo-cfgs/config_cpcm5_notebook.txt b/demo-cfgs/config_cpcm5_notebook.txt deleted file mode 100755 index cede4056e..000000000 --- a/demo-cfgs/config_cpcm5_notebook.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd.img -dtb=rk3588-cpcm5-notebook.dtb - diff --git a/demo-cfgs/config_cpnano.txt b/demo-cfgs/config_cpnano.txt deleted file mode 100755 index 194b7535e..000000000 --- a/demo-cfgs/config_cpnano.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootdir=/ -kernel=vmlinuz -initrd=initrd32.img -dtb=rv1106-cpnano.dtb -