From a3b199d23a09ce2f0c51830cc4d288bd57e48704 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 12 Mar 2021 23:32:16 +0100 Subject: [PATCH] - cst/hd2: do always update kernel --- make/buildsystem-bootstrap.mk | 6 +--- make/linux-kernel.mk | 15 +++++----- skel-root/general/scripts/stb_update_hd1.sh | 30 +++++-------------- skel-root/general/scripts/stb_update_hd2.sh | 33 +++++---------------- 4 files changed, 25 insertions(+), 59 deletions(-) diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk index 883fe447..84a273a8 100644 --- a/make/buildsystem-bootstrap.mk +++ b/make/buildsystem-bootstrap.mk @@ -112,10 +112,7 @@ var-update: $(TARGET_localstatedir)/update $(TARGET_localstatedir)/update: | $(TARGET_DIR) mkdir -p $(@) -ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1)) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/zImage $(@) -else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/vmlinux.ub.gz $(@) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/uldr.bin $(@) ifeq ($(BOXMODEL),kronos_v2) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin @@ -123,7 +120,6 @@ else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin $(@) endif endif - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/stb_update.data $(@) endif diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 5131116b..ed691fa1 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -253,19 +253,20 @@ kernel-coolstream: kernel-coolstream-$(BOXSERIES) $(TOUCH) kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR) - $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img - $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img + $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(TARGET_localstatedir)/update/zImage + $(INSTALL_DATA) $(TARGET_localstatedir)/update/zImage $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(TOUCH) kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR) - $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz + $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(TARGET_localstatedir)/update/vmlinux.ub.gz + $(INSTALL_DATA) $(TARGET_localstatedir)/update/vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) ifeq ($(BOXMODEL),apollo) - # create also shiner-kernel when building apollo - $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz + # create kernel for shiner too when building apollo + $(INSTALL_DATA) $(TARGET_localstatedir)/update/vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz else ifeq ($(BOXMODEL),shiner) - # create also apollo-kernel when building shiner - $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz + # create kernel for apollo too when building shiner + $(INSTALL_DATA) $(TARGET_localstatedir)/update/vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz endif endif $(TOUCH) diff --git a/skel-root/general/scripts/stb_update_hd1.sh b/skel-root/general/scripts/stb_update_hd1.sh index 93681312..30d1fd5a 100644 --- a/skel-root/general/scripts/stb_update_hd1.sh +++ b/skel-root/general/scripts/stb_update_hd1.sh @@ -4,35 +4,21 @@ DO_REBOOT=0 -if [ -e /var/update/stb_update.data ]; then - . /var/update/stb_update.data 2> /dev/null -fi - -if [ -e /var/etc/.stb_update ]; then - rm /var/etc/.stb_update - # force an update with a bogus date - V_KERNEL="Sun Jan 1 00:00:00 CET 2042" -fi - if [ -f /var/update/zImage ]; then DEV=`grep -i kernel /proc/mtd | cut -f 0 -s -d :` - grep -q "$V_KERNEL" /proc/version - if [ $? == 1 ]; then - test -e /dev/display && dt -t"Kernel Update. Please wait..." - SHOWINFO "Updating kernel on device $DEV ..." - flash_erase /dev/$DEV 0 0 && cat /var/update/zImage > /dev/$DEV - test -e /dev/display && dt -t"Update OK. Reboot!" - SHOWINFO "Kernel update on device $DEV successful. reboot!" - DO_REBOOT=1 - else - SHOWINFO "Kernel already up-to-date" - fi + test -e /dev/display && dt -t"Kernel Update. Please wait ..." + SHOWINFO "Updating kernel on device $DEV ..." + flash_erase /dev/$DEV 0 0 && cat /var/update/zImage > /dev/$DEV + test -e /dev/display && dt -t"Kernel Update OK." + SHOWINFO "Kernel update on device $DEV successful." + DO_REBOOT=1 rm -f /var/update/zImage fi if [ $DO_REBOOT == 1 ]; then - SHOWINFO "Reboot ..." sync sleep 2 + test -e /dev/display && dt -t"Reboot" + SHOWINFO "Reboot ..." reboot -f fi diff --git a/skel-root/general/scripts/stb_update_hd2.sh b/skel-root/general/scripts/stb_update_hd2.sh index d7599e21..5d7fc707 100644 --- a/skel-root/general/scripts/stb_update_hd2.sh +++ b/skel-root/general/scripts/stb_update_hd2.sh @@ -4,35 +4,19 @@ DO_REBOOT=0 -if [ -e /var/update/stb_update.data ]; then - . /var/update/stb_update.data 2> /dev/null -fi - -if [ -e /var/etc/.stb_update ]; then - rm /var/etc/.stb_update - # force an update with a bogus date - V_KERNEL="Sun Jan 1 00:00:00 CET 2042" - #V_UBOOT="Sun Jan 01 2042 - 00:00:00" - #V_ULDR="Sun Jan 01 2042 00:00:00" -fi - if [ -f /var/update/vmlinux.ub.gz ]; then DEV=`grep -i kernel /proc/mtd | cut -f 0 -s -d :` - grep -q "$V_KERNEL" /proc/version - if [ $? == 1 ]; then - SHOWINFO "Updating kernel on device $DEV ..." - flash_erase /dev/$DEV 0 0 && cat /var/update/vmlinux.ub.gz > /dev/$DEV - DO_REBOOT=1 - else - SHOWINFO "Kernel already up-to-date" - fi + test -e /dev/display && dt -t"Kernel Update. Please wait ..." + SHOWINFO "Updating kernel on device $DEV ..." + flash_erase /dev/$DEV 0 0 && cat /var/update/vmlinux.ub.gz > /dev/$DEV + test -e /dev/display && dt -t"Kernel Update OK." + SHOWINFO "Kernel update on device $DEV successful." + DO_REBOOT=1 rm /var/update/vmlinux.ub.gz fi if [ -f /var/update/u-boot.bin ]; then DEV=`grep -i u-boot /proc/mtd | cut -f 0 -s -d :` - SHOWINFO "This sucks..." - SHOWINFO "Updating u-boot on device $DEV ..." flash_erase /dev/$DEV 0 0 && cat /var/update/u-boot.bin > /dev/$DEV DO_REBOOT=1 rm /var/update/u-boot.bin @@ -54,16 +38,15 @@ fi if [ -f /var/update/uldr.bin ]; then DEV=`grep -i uldr /proc/mtd | cut -f 0 -s -d :` - SHOWINFO "This sucks..." - SHOWINFO "Updating microloader on device $DEV ..." flash_erase /dev/$DEV 0 0 && cat /var/update/uldr.bin > /dev/$DEV DO_REBOOT=1 rm /var/update/uldr.bin fi if [ $DO_REBOOT == 1 ]; then - SHOWINFO "Reboot ..." sync sleep 2 + test -e /dev/display && dt -t"Reboot" + SHOWINFO "Reboot ..." reboot -f fi