diff --git a/mkimg.sh b/mkimg.sh index 197619a..ac4bcc1 100755 --- a/mkimg.sh +++ b/mkimg.sh @@ -140,7 +140,7 @@ label LineageOS Android TV kernel /Image fdt /rk3588-orangepi-5-ultra.dtb initrd /ramdisk.img - append console=ttyS2,1500000 no_console_suspend root=/dev/ram0 rootwait androidboot.hardware=tart androidboot.selinux=permissive androidboot.boot_devices=fe2c0000.mmc androidboot.console=ttyS2 androidboot.wificountrycode=US + append console=ttyS2,1500000 no_console_suspend root=/dev/ram0 rootwait androidboot.hardware=tart androidboot.selinux=permissive androidboot.boot_devices=fe2c0000.mmc androidboot.console=ttyS2 EXTLINUX_EOF sudo cp ${KERNEL_PATH}/boot.scr "${BOOT_MOUNT}/" sudo cp ${KERNEL_PATH}/android-sdcard.dtbo "${BOOT_MOUNT}/" diff --git a/vendor.prop b/vendor.prop index 4636678..47fd3c4 100644 --- a/vendor.prop +++ b/vendor.prop @@ -81,7 +81,10 @@ persist.device_config.mglru_native.lru_gen_config=core ro.boot.hypervisor.vm.supported=1 # Wifi -ro.boot.wificountrycode=00 +# Single source of truth for the regulatory country code. Init exports this to +# the framework's WifiCountryCode; ro.boot.* is set-once, so this must NOT also +# appear as androidboot.wificountrycode on the kernel cmdline (mkimg.sh). +ro.boot.wificountrycode=US wifi.interface=wlan0 # Window extensions