diff --git a/config/boot-guitar.cmd b/config/boot-guitar.cmd index 9a13bfb117..7ccebdb885 100644 --- a/config/boot-guitar.cmd +++ b/config/boot-guitar.cmd @@ -1,5 +1,8 @@ -setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty0 rootfstype=ext4 console=ttyS3 loglevel=1 rootwait" +# console=ttyS3 # serial +setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty1 rootfstype=ext4 loglevel=1 rootwait" setenv os_type linux fatload mmc 0:1 0x04000000 dtb/lemaker_guitar_bbb.dtb fatload mmc 0:1 0x7fc0 zImage -bootz 0x7fc0 - 0x04000000 \ No newline at end of file +bootz 0x7fc0 - 0x04000000 +# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr + \ No newline at end of file diff --git a/config/linux-s500-default.config b/config/linux-s500-default.config index 5259f91f77..583ac0a163 100644 --- a/config/linux-s500-default.config +++ b/config/linux-s500-default.config @@ -934,6 +934,7 @@ CONFIG_NET_CLS_ACT=y # CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=m # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set @@ -1022,6 +1023,8 @@ CONFIG_RFKILL_LEDS=y # CONFIG_NET_9P is not set # CONFIG_CAIF is not set CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set CONFIG_HAVE_BPF_JIT=y @@ -2397,11 +2400,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_LOGO_ACTIONS_CLUT224 is not set +# CONFIG_LOGO is not set # CONFIG_FB_SSD1307 is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set @@ -3315,6 +3314,8 @@ CONFIG_CONFIGFS_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -3357,9 +3358,11 @@ CONFIG_SUNRPC=y CONFIG_CIFS=y # CONFIG_CIFS_STATS is not set # CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -3552,7 +3555,9 @@ CONFIG_EARLY_PRINTK=y # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y @@ -3574,6 +3579,7 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 # CONFIG_SECURITY_YAMA is not set # CONFIG_IMA is not set +# CONFIG_EVM is not set CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_DAC is not set @@ -3687,6 +3693,8 @@ CONFIG_CRYPTO_ANSI_CPRNG=y # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set CONFIG_CRYPTO_HW=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +# CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set CONFIG_BINARY_PRINTF=y #