A particular intention of this change is to remove the serial setting in kernel command line that is hardcoded in core2 and corei7 conf files.
However we cannot use KBOOTPARAM because it is designed as a fragment appended to hardcoded part at runtime. This is why we need to create more files in this patch to use cmdline in bootloader entry files to bypass whatever from the build. Once we have a clean base (no any preset console setting) in generic configurations, this change can be dropped. Signed-off-by: Jianxun Zhang <jianxun.zh...@linux.intel.com> --- Saul, This is proposal #2 to remove a console hardcoded in core* conf files without touching them. This change is only for the concerned NUC model. That means other boards having same recent ttyS0 issue are not covered. If prposal #1 is acceptable (in another mail), you don't need this change because #1 applies all boards. Thanks common/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG | 2 ++ common/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG | 2 ++ common/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh | 2 ++ common/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf | 4 ++++ common/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf | 4 ++++ common/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp | Bin 0 -> 149 bytes 6 files changed, 14 insertions(+) create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf create mode 100644 common/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG b/common/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG new file mode 100644 index 0000000..b2fabe8 --- /dev/null +++ b/common/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG @@ -0,0 +1,2 @@ +boot.conf +install.conf diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG b/common/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG new file mode 100644 index 0000000..ca5f04b --- /dev/null +++ b/common/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG @@ -0,0 +1,2 @@ +efi_entry_dir:root:disk:770:/boot/loader/entries/ +boot.conf:root:disk:770:/boot/loader/entries/rmcboot.conf diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh b/common/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh new file mode 100644 index 0000000..6694261 --- /dev/null +++ b/common/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh @@ -0,0 +1,2 @@ +# There is no tty device on this board. +sed -i '/start_getty.\+ttyS.*/d' /tgt_root/etc/inittab diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf b/common/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf new file mode 100644 index 0000000..b29fa45 --- /dev/null +++ b/common/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf @@ -0,0 +1,4 @@ +title NUC5i5RYB boot +linux /vmlinuz +initrd /initrd +options LABEL=boot rootwait diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf b/common/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf new file mode 100644 index 0000000..0dca3ca --- /dev/null +++ b/common/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf @@ -0,0 +1,4 @@ +title NUC5i5RYB install +linux /vmlinuz +initrd /initrd +options LABEL=install-efi rootwait diff --git a/common/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp b/common/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp new file mode 100644 index 0000000000000000000000000000000000000000..57374779069490cf24c17bea740d49c00e5ac9b9 GIT binary patch literal 149 zcmZQ%Ehx%QDNQbk&r8frWl$gl7?@Bs_=P%~W|{^?Ix(;al%*CGXXfWIc;=O)=4b?I yDmdpCrD}xuYAR%!>Y5sv8iXo12ZSm(C>ZLQ8Mu2?G1M~@r52|am8GUIps)dnw<bye literal 0 HcmV?d00001 -- 2.7.4 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel