mirror of https://github.com/OpenIPC/firmware.git
Fix Hi3516Av300 building and some initramfs changes
parent
95a77ddb88
commit
49512885a5
|
@ -75,7 +75,7 @@ jobs:
|
||||||
id: build-hi3516av300-sdk
|
id: build-hi3516av300-sdk
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-glibc_sdk-buildroot.tar.gz"
|
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
||||||
cd $GITHUB_WORKSPACE/output
|
cd $GITHUB_WORKSPACE/output
|
||||||
make sdk
|
make sdk
|
||||||
|
@ -119,7 +119,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
file: ${{ env.ARCHIVE_SDK }}
|
file: ${{ env.ARCHIVE_SDK }}
|
||||||
asset_name: "arm-openipc-hi3516av300-linux-glibc_sdk-buildroot.tar.gz"
|
asset_name: "arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
tag: ${{ env.TAG_NAME }}
|
tag: ${{ env.TAG_NAME }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@ jobs:
|
||||||
id: build-hi3516cv500-sdk
|
id: build-hi3516cv500-sdk
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-glibc_sdk-buildroot.tar.gz"
|
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
||||||
cd $GITHUB_WORKSPACE/output
|
cd $GITHUB_WORKSPACE/output
|
||||||
make sdk
|
make sdk
|
||||||
|
@ -119,7 +119,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
file: ${{ env.ARCHIVE_SDK }}
|
file: ${{ env.ARCHIVE_SDK }}
|
||||||
asset_name: "arm-openipc-hi3516cv500-linux-glibc_sdk-buildroot.tar.gz"
|
asset_name: "arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
tag: ${{ env.TAG_NAME }}
|
tag: ${{ env.TAG_NAME }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@ jobs:
|
||||||
id: build-hi3516dv300-sdk
|
id: build-hi3516dv300-sdk
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-glibc_sdk-buildroot.tar.gz"
|
ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
|
||||||
cd $GITHUB_WORKSPACE/output
|
cd $GITHUB_WORKSPACE/output
|
||||||
make sdk
|
make sdk
|
||||||
|
@ -119,7 +119,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
file: ${{ env.ARCHIVE_SDK }}
|
file: ${{ env.ARCHIVE_SDK }}
|
||||||
asset_name: "arm-openipc-hi3516dv300-linux-glibc_sdk-buildroot.tar.gz"
|
asset_name: "arm-openipc-linux-gnueabi_sdk-buildroot.tar.gz"
|
||||||
tag: ${{ env.TAG_NAME }}
|
tag: ${{ env.TAG_NAME }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/scripts/dtc/dtc-lexer.lex.c_shipped 2016-08-28 13:19:20.000000000 +0300
|
||||||
|
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped 2021-04-02 00:06:02.972781070 +0300
|
||||||
|
@@ -637,7 +637,7 @@
|
||||||
|
#include "srcpos.h"
|
||||||
|
#include "dtc-parser.tab.h"
|
||||||
|
|
||||||
|
-YYLTYPE yylloc;
|
||||||
|
+extern YYLTYPE yylloc;
|
||||||
|
extern bool treesource_error;
|
||||||
|
|
||||||
|
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
|
|
@ -6,7 +6,7 @@
|
||||||
SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
||||||
+
|
+
|
||||||
+ { "fm25q128a", INFO(0xa14018, 0, 64 * 1024, 256,
|
+ { "fm25q128a", INFO(0xa14018, 0, 64 * 1024, 256,
|
||||||
+ SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
+ SECT_4K | SPI_NOR_DUAL_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
||||||
+
|
+
|
||||||
{ "gd25q256", INFO(0xc84019, 0, 64 * 1024, 512,
|
{ "gd25q256", INFO(0xc84019, 0, 64 * 1024, 512,
|
||||||
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES), PARAMS(gd), CLK_MHZ_2X(80) },
|
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES), PARAMS(gd), CLK_MHZ_2X(80) },
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/mtd/spi-nor/spi-nor.c 2021-08-23 08:00:01.771026933 +0300
|
|
||||||
+++ b/drivers/mtd/spi-nor/spi-nor.c 2021-08-23 08:04:33.973630596 +0300
|
|
||||||
@@ -1219,7 +1219,7 @@
|
|
||||||
SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
|
||||||
|
|
||||||
{ "fm25q128a", INFO(0xa14018, 0, 64 * 1024, 256,
|
|
||||||
- SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
|
||||||
+ SECT_4K | SPI_NOR_DUAL_READ), PARAMS(gd), CLK_MHZ_2X(80) },
|
|
||||||
|
|
||||||
{ "gd25q256", INFO(0xc84019, 0, 64 * 1024, 512,
|
|
||||||
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES), PARAMS(gd), CLK_MHZ_2X(80) },
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1 @@
|
||||||
|
ssc335.initramfs.config.test01
|
|
@ -28,21 +28,16 @@ BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER=y
|
||||||
BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER_LIST="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/patches/ $(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/overlay"
|
BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER_LIST="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/patches/ $(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/overlay"
|
||||||
|
|
||||||
# Filesystem
|
# Filesystem
|
||||||
# BR2_TARGET_TZ_INFO is not set
|
|
||||||
BR2_TARGET_ROOTFS_INITRAMFS=y
|
BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||||
BR2_TARGET_ROOTFS_SQUASHFS=y
|
|
||||||
BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
|
|
||||||
BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
|
BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
|
||||||
BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh $(TOPDIR)/../scripts/executing_commands_for_initramfs.sh"
|
BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh $(TOPDIR)/../scripts/executing_commands_for_initramfs.sh"
|
||||||
|
|
||||||
# OpenIPC configuration
|
# OpenIPC configuration
|
||||||
BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
|
BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
|
||||||
BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1.8"
|
BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1"
|
||||||
BR2_TARGET_GENERIC_HOSTNAME="ssc335-initramfs"
|
BR2_TARGET_GENERIC_HOSTNAME="ssc335-initramfs"
|
||||||
BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
|
BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
|
||||||
|
|
||||||
# OpenIPC packages
|
# OpenIPC packages
|
||||||
BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox-initramfs.config"
|
BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox-initramfs.config"
|
||||||
# BR2_PACKAGE_DROPBEAR is not set
|
|
||||||
# BR2_PACKAGE_FWPRINTENV_OPENIPC is not set
|
|
||||||
BR2_PACKAGE_IPCTOOL=y
|
BR2_PACKAGE_IPCTOOL=y
|
||||||
|
|
|
@ -27,7 +27,7 @@ rename() {
|
||||||
}
|
}
|
||||||
|
|
||||||
rename_initramfs() {
|
rename_initramfs() {
|
||||||
[[ $(stat --printf="%s" ./output/images/uImage) -gt 3097152 ]] && TG_NOTIFY="Warning: kernel size exceeded : $(stat --printf="%s" ./output/images/uImage) vs 2097152" && exit 1
|
[[ $(stat --printf="%s" ./output/images/uImage) -gt 4097152 ]] && TG_NOTIFY="Warning: kernel size exceeded : $(stat --printf="%s" ./output/images/uImage) vs 2097152" && exit 1
|
||||||
#
|
#
|
||||||
mv -v ./output/images/uImage ./output/images/uImage.initramfs.${soc}
|
mv -v ./output/images/uImage ./output/images/uImage.initramfs.${soc}
|
||||||
mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${soc}.cpio
|
mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${soc}.cpio
|
||||||
|
|
|
@ -459,14 +459,14 @@ CONFIG_GREP=y
|
||||||
# CONFIG_EGREP is not set
|
# CONFIG_EGREP is not set
|
||||||
# CONFIG_FGREP is not set
|
# CONFIG_FGREP is not set
|
||||||
# CONFIG_FEATURE_GREP_CONTEXT is not set
|
# CONFIG_FEATURE_GREP_CONTEXT is not set
|
||||||
# CONFIG_XARGS is not set
|
CONFIG_XARGS=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
|
# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
|
||||||
# CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE is not set
|
CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Init Utilities
|
# Init Utilities
|
||||||
|
@ -919,7 +919,7 @@ CONFIG_ROUTE=y
|
||||||
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
|
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
|
||||||
# CONFIG_FEATURE_TELNET_WIDTH is not set
|
# CONFIG_FEATURE_TELNET_WIDTH is not set
|
||||||
CONFIG_TELNETD=y
|
CONFIG_TELNETD=y
|
||||||
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
|
CONFIG_FEATURE_TELNETD_STANDALONE=y
|
||||||
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
|
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
|
||||||
# CONFIG_TFTP is not set
|
# CONFIG_TFTP is not set
|
||||||
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
|
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
|
||||||
|
@ -1140,7 +1140,7 @@ CONFIG_FEATURE_SH_READ_FRAC=y
|
||||||
#
|
#
|
||||||
# CONFIG_KLOGD is not set
|
# CONFIG_KLOGD is not set
|
||||||
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
|
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
|
||||||
# CONFIG_LOGGER is not set
|
CONFIG_LOGGER=y
|
||||||
# CONFIG_LOGREAD is not set
|
# CONFIG_LOGREAD is not set
|
||||||
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
||||||
# CONFIG_SYSLOGD is not set
|
# CONFIG_SYSLOGD is not set
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
config BR2_PACKAGE_FWPRINTENV_OPENIPC
|
config BR2_PACKAGE_FWPRINTENV_OPENIPC
|
||||||
bool "fwprintenv-openipc from u-boot tools"
|
bool "fwprintenv-openipc from u-boot tools"
|
||||||
default y
|
default n
|
||||||
help
|
help
|
||||||
Install the fw_printenv / fw_setenv tools on the target system
|
Install the fw_printenv / fw_setenv tools on the target system
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ echo 'Note: Deleting unused files from the image..'
|
||||||
#
|
#
|
||||||
rm -f ${TARGET_DIR}/etc/init.d/S01syslogd
|
rm -f ${TARGET_DIR}/etc/init.d/S01syslogd
|
||||||
rm -f ${TARGET_DIR}/etc/init.d/S10modules
|
rm -f ${TARGET_DIR}/etc/init.d/S10modules
|
||||||
|
rm -f ${TARGET_DIR}/etc/init.d/S20urandom
|
||||||
rm -f ${TARGET_DIR}/etc/init.d/S21rngd
|
rm -f ${TARGET_DIR}/etc/init.d/S21rngd
|
||||||
rm -f ${TARGET_DIR}/etc/init.d/S40mdev
|
rm -f ${TARGET_DIR}/etc/init.d/S40mdev
|
||||||
rm -f ${TARGET_DIR}/etc/init.d/S49ntpd
|
rm -f ${TARGET_DIR}/etc/init.d/S49ntpd
|
||||||
|
@ -15,3 +16,13 @@ rm -f ${TARGET_DIR}/etc/init.d/S50snmpd
|
||||||
#
|
#
|
||||||
rm -rf ${TARGET_DIR}/etc/ssl
|
rm -rf ${TARGET_DIR}/etc/ssl
|
||||||
#
|
#
|
||||||
|
rm -f ${TARGET_DIR}/lib/libatomic*
|
||||||
|
rm -f ${TARGET_DIR}/lib/libgcc*
|
||||||
|
#
|
||||||
|
#rm -rf ${TARGET_DIR}/lib/modules
|
||||||
|
#
|
||||||
|
rm -rf ${TARGET_DIR}/usr/sbin/firstboot
|
||||||
|
rm -rf ${TARGET_DIR}/usr/sbin/sysupgrade
|
||||||
|
#
|
||||||
|
# mkdir -p ${TARGET_DIR}/dev ; mknod ${TARGET_DIR}/dev/null c 3 2; chmod 666 ${TARGET_DIR}/dev/null
|
||||||
|
#
|
||||||
|
|
Loading…
Reference in New Issue