diff --git a/mainboards/ampere/jade/Makefile b/mainboards/ampere/jade/Makefile index 94d8cf7..decb28c 100644 --- a/mainboards/ampere/jade/Makefile +++ b/mainboards/ampere/jade/Makefile @@ -21,17 +21,7 @@ flashinitramfs.cpio.lzma: flashinitramfs.cpio lzma -f -k $< flashinitramfs.cpio: Makefile - GOARCH=arm64 u-root -o $@ -build=bb \ - -uinitcmd=/bbin/pxeboot \ - github.com/u-root/u-root/cmds/boot/pxeboot \ - github.com/u-root/u-root/cmds/core/cat \ - github.com/u-root/u-root/cmds/core/elvish \ - github.com/u-root/u-root/cmds/core/init \ - github.com/u-root/u-root/cmds/core/ip \ - github.com/u-root/u-root/cmds/core/ls \ - github.com/u-root/u-root/cmds/core/kexec \ - github.com/u-root/u-root/cmds/core/pci \ - github.com/u-root/u-root/cmds/core/wget \ + GOARCH=arm64 u-root -o $@ -build=bb all # this target builds an initramfs with only one program, the cpu server. # It depends on the kernel setting the IP address. diff --git a/mainboards/ampere/jade/flash.config b/mainboards/ampere/jade/flash.config index 662e1f9..db43fa0 100644 --- a/mainboards/ampere/jade/flash.config +++ b/mainboards/ampere/jade/flash.config @@ -4,10 +4,11 @@ # # -# Compiler: aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) 7.5.0 +# Compiler: gcc (Debian 9.3.0-8) 9.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70500 +CONFIG_GCC_VERSION=90300 +CONFIG_LD_VERSION=234000000 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -142,26 +143,17 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="../flashinitramfs.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -CONFIG_INITRAMFS_COMPRESSION=".gz" -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_INITRAMFS_COMPRESSION_GZIP=y -# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_INITRAMFS_COMPRESSION_XZ is not set -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set -# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y ->>>>>>> Stashed changes CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y @@ -244,6 +236,7 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_BROKEN_GAS_INST=y # # Platform selection @@ -387,10 +380,6 @@ CONFIG_ARM64_VHE=y # # ARMv8.3 architectural features # -# CONFIG_ARM64_PTR_AUTH is not set -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y -CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y -CONFIG_AS_HAS_PAC=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features @@ -2202,8 +2191,6 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y @@ -2213,12 +2200,7 @@ CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y @@ -2356,6 +2338,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21 CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y