From d903d41ab3ec2e6be99bb60d5e8fdaf421a302a8 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 7 Jan 2020 05:14:16 +0000 Subject: [PATCH] various fixups including right kernel tree and initrd in spi Signed-off-by: Ronald G. Minnich --- mainboards/digitalloggers/atomicpi/Makefile | 21 +++++++++++++++------ mainboards/digitalloggers/atomicpi/grub.cfg | 3 +++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mainboards/digitalloggers/atomicpi/Makefile b/mainboards/digitalloggers/atomicpi/Makefile index 8c18a8e..155ea80 100644 --- a/mainboards/digitalloggers/atomicpi/Makefile +++ b/mainboards/digitalloggers/atomicpi/Makefile @@ -3,10 +3,10 @@ default: build build: echo fetch, uroot, kernel, or image.bin -image.bin: +dxeremove.bin: utk \ -xzPath /usr/bin/xz \ - ROM.bin \ + image.bin \ remove Nb.* \ remove IntelIsh.* \ remove Ip.* \ @@ -44,16 +44,25 @@ image.bin: remove Tcg.* \ remove Ish.* \ remove Setup \ - save image.bin - utk image.bin table | guid2english | grep Free + save dxeremove.bin + utk dxeremove.bin table | guid2english | grep Free echo \ remove AmiTc.* \ echo need 0x16b4a0 +imagex.bin: image.bin + utk image.bin tighten_me save imagex.bin + me_cleaner.py -s imagex.bin + @echo flash, for example cpu u8 flashrom -w imagex.bin -p internal + +imageinitramfs.bin: imagex.bin + cp imagex.bin $@ + dd if=initramfs.linux_amd64.cpio.lzma of=$@ bs=4096 seek=360 conv=notrunc + kernel: uroot bzImage cp linux/arch/x86/boot/bzImage kernel -install: kernel +install: sudo mkdir -p /var/lib/tftpboot/grub sudo cp grub.cfg /var/lib/tftpboot/grub sudo cp grubnetx64.efi.signed /var/lib/tftpboot @@ -107,7 +116,7 @@ fetch: getkernel geturoot getfiano getrom getkernel: rm -rf linux - git clone --depth=1 git@github.com:linuxboot/linux + git clone --depth=1 -b linuxboot --single-branch git@github.com:linuxboot/linux getstablekernel: wget -O kernel.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.3.10.tar.xz diff --git a/mainboards/digitalloggers/atomicpi/grub.cfg b/mainboards/digitalloggers/atomicpi/grub.cfg index c65565b..daf6208 100644 --- a/mainboards/digitalloggers/atomicpi/grub.cfg +++ b/mainboards/digitalloggers/atomicpi/grub.cfg @@ -1,5 +1,8 @@ timeout=0 +menuentry "NERF with linuxboot build no graphics dbgp initramfs in SPI" { + linux kernel ip=dhcp earlyprintk=ttyS0,115200 netconsole=6666@192.168.0.2/,6666@192.168.0.1/ initrd=0xff968000,1294143 +} menuentry "NERF with linuxboot build no graphics dbgp" { linux kernel ip=dhcp earlyprintk=ttyS0,115200 netconsole=6666@192.168.0.2/,6666@192.168.0.1/ initrd /initramfs.linux_amd64.cpio.lzma