From 932f410cff57d1364b5fdedd6cd9378a920e6856 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (via Araneus server)" Date: Wed, 30 Jun 2021 12:00:34 +0300 Subject: [PATCH] Update ssc335, banners and profile --- .../patches_unused/disable_quad_flash.patch | 26 +++++++++++++++++++ ...unknown_unknown_ssc335_blackbird_defconfig | 2 ++ building.sh | 1 + general/overlay/etc/openipc_banner | 9 +++++++ general/overlay/etc/openipc_donaters | 1 + general/overlay/etc/profile | 3 ++- 6 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches_unused/disable_quad_flash.patch create mode 100644 general/overlay/etc/openipc_banner diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches_unused/disable_quad_flash.patch b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches_unused/disable_quad_flash.patch new file mode 100644 index 00000000..1c9bc689 --- /dev/null +++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches_unused/disable_quad_flash.patch @@ -0,0 +1,26 @@ +diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c +index 36a79999..43718cac 100644 +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -2191,7 +2191,6 @@ static int spi_nor_setup(struct spi_nor *nor, const struct flash_info *info, + + enable_quad_io = (SNOR_PROTO_DATA_FROM_PROTO(nor->read_proto) == 4 || + SNOR_PROTO_DATA_FROM_PROTO(nor->write_proto) == 4); +- enable_quad_io = 0; + + /* Enable Quad I/O if needed. */ + if (enable_quad_io && params->enable_quad_io) { +@@ -2458,10 +2457,8 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, + if (info->flags & SPI_NOR_NO_FR) + modes->rd_modes &= ~SNOR_MODE_1_1_1; + +- nor->erase_proto = SNOR_PROTO_1_1_1; +- nor->read_proto = SNOR_PROTO_1_1_1; +- nor->write_proto = SNOR_PROTO_1_1_1; +- modes->rd_modes = SNOR_MODE_1_1_1; ++ modes->rd_modes = SNOR_EON_RD_MODES; ++ modes->wr_modes = SNOR_EON_WR_MODES; + printk("@spi_nor_scan(), modes->rd_modes:0x%x.\n", modes->rd_modes); + + nor->program_opcode = SPINOR_OP_PP; + diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig index c4588875..bb3bf38a 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig @@ -19,6 +19,7 @@ BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" # BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y # Kernel @@ -80,3 +81,4 @@ BR2_PACKAGE_YAML_CLI=y # BlackBird BR2_PACKAGE_GDBSERVER_LITE=y +BR2_PACKAGE_GESFTPSERVER=y diff --git a/building.sh b/building.sh index 32616f26..873e21d5 100755 --- a/building.sh +++ b/building.sh @@ -16,6 +16,7 @@ fresh() { rename() { [[ $(stat --printf="%s" ./output/images/uImage) -gt 2097152 ]] && TG_NOTIFY="Warning: kernel size exceeded : $(stat --printf="%s" ./output/images/uImage) vs 2097152" && exit 1 [[ $(stat --printf="%s" ./output/images/rootfs.squashfs) -gt 5242880 ]] && TG_NOTIFY="Warning: rootfs size exceeded - $(stat --printf="%s" ./output/images/rootfs.squashfs) vs 5242880" && exit 1 + # mv -v ./output/images/uImage ./output/images/uImage.${soc} mv -v ./output/images/rootfs.squashfs ./output/images/rootfs.squashfs.${soc} mv -v ./output/images/rootfs.tar ./output/images/rootfs.${soc}.tar diff --git a/general/overlay/etc/openipc_banner b/general/overlay/etc/openipc_banner new file mode 100644 index 00000000..8e27c5cb --- /dev/null +++ b/general/overlay/etc/openipc_banner @@ -0,0 +1,9 @@ + + + ___ _ ___ ___ +/ \ ___ ___ _ _ | || \/ _| +| | || \/ _ \| \| || || | || | +| | || | | __/| \ || || _/| |_ +\___/| _/\___||_|\_||_||_| \___|.ORG v2.1 + |_| + diff --git a/general/overlay/etc/openipc_donaters b/general/overlay/etc/openipc_donaters index 588c4651..3bce46d2 100644 --- a/general/overlay/etc/openipc_donaters +++ b/general/overlay/etc/openipc_donaters @@ -5,3 +5,4 @@ role in the advancement of a stable, flexible and most importantly, Open IP Netw Your contribution will help us advance development proposals forward, and interact with the community on a regular basis. https://openipc.org/sponsor/ + diff --git a/general/overlay/etc/profile b/general/overlay/etc/profile index e056c963..a908a065 100644 --- a/general/overlay/etc/profile +++ b/general/overlay/etc/profile @@ -4,7 +4,8 @@ export HOME=${HOME:-/root} export TZ=$(cat /etc/TZ) if [ "$PS1" ]; then - echo -e "\n\e[1;36m* * *\e[0m\n$(cat /etc/openipc_donaters)\n\n" + [ -f /etc/openipc_banner ] && echo -e "\n\e[1;36m$(cat /etc/openipc_banner)\e[0m\n" + [ -f /etc/openipc_donaters ] && echo -e "\n\e[1;36m$(cat /etc/openipc_donaters)\e[0m\n\n" # if [ "`id -u`" -eq 0 ]; then export PS1='\u@\h:\w\# '