diff --git a/arch/arm64/configs/odroidn1_defconfig b/arch/arm64/configs/odroidn1_defconfig index 0155b684a970..3a03cca5bf5f 100644 --- a/arch/arm64/configs/odroidn1_defconfig +++ b/arch/arm64/configs/odroidn1_defconfig @@ -784,11 +784,13 @@ CONFIG_UEVENT_HELPER_PATH="" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_EXTRA_FIRMWARE="edid/2560x1600.bin edid/2560x1440.bin edid/2560x1080.bin edid/1920x1080_24hz.bin edid/1920x1080_23_976hz.bin edid/848x480.bin edid/1152x864_75hz.bin edid/1280x768.bin edid/1920x800.bin edid/1400x1050.bin edid/1792x1344.bin edid/1024x768.bin edid/1280x800.bin edid/1920x1080.bin edid/720x480.bin edid/800x600.bin edid/800x480.bin edid/480x800.bin edid/480x320.bin edid/1280x1024.bin edid/1280x720.bin edid/1440x900.bin edid/1680x1050.bin edid/1360x768.bin edid/1366x768.bin edid/1600x1200.bin edid/1600x900.bin edid/1920x1200_30hz.bin edid/1920x1200_60hz.bin edid/1920x1080_50hz.bin edid/640x480.bin edid/720x576.bin edid/1024x600.bin" +CONFIG_EXTRA_FIRMWARE_DIR="firmware" +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y @@ -2580,7 +2582,7 @@ CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk" # Frame buffer Devices # CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set +CONFIG_FIRMWARE_EDID=y CONFIG_FB_CMDLINE=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set diff --git a/firmware/edid/1024x600.bin b/firmware/edid/1024x600.bin new file mode 100644 index 000000000000..fd22361c4a86 Binary files /dev/null and b/firmware/edid/1024x600.bin differ diff --git a/firmware/edid/1024x768.bin b/firmware/edid/1024x768.bin new file mode 100644 index 000000000000..bae478cead8b Binary files /dev/null and b/firmware/edid/1024x768.bin differ diff --git a/firmware/edid/1152x864_75hz.bin b/firmware/edid/1152x864_75hz.bin new file mode 100644 index 000000000000..49c9110d7ab3 Binary files /dev/null and b/firmware/edid/1152x864_75hz.bin differ diff --git a/firmware/edid/1280x1024.bin b/firmware/edid/1280x1024.bin new file mode 100644 index 000000000000..b4d16341a27e Binary files /dev/null and b/firmware/edid/1280x1024.bin differ diff --git a/firmware/edid/1280x720.bin b/firmware/edid/1280x720.bin new file mode 100644 index 000000000000..1631cd184db9 Binary files /dev/null and b/firmware/edid/1280x720.bin differ diff --git a/firmware/edid/1280x768.bin b/firmware/edid/1280x768.bin new file mode 100644 index 000000000000..139191261c64 Binary files /dev/null and b/firmware/edid/1280x768.bin differ diff --git a/firmware/edid/1280x800.bin b/firmware/edid/1280x800.bin new file mode 100644 index 000000000000..d7c59430b572 Binary files /dev/null and b/firmware/edid/1280x800.bin differ diff --git a/firmware/edid/1360x768.bin b/firmware/edid/1360x768.bin new file mode 100644 index 000000000000..a6502e171e47 Binary files /dev/null and b/firmware/edid/1360x768.bin differ diff --git a/firmware/edid/1366x768.bin b/firmware/edid/1366x768.bin new file mode 100644 index 000000000000..bfdd83fdddef Binary files /dev/null and b/firmware/edid/1366x768.bin differ diff --git a/firmware/edid/1400x1050.bin b/firmware/edid/1400x1050.bin new file mode 100644 index 000000000000..61627d0669eb Binary files /dev/null and b/firmware/edid/1400x1050.bin differ diff --git a/firmware/edid/1440x900.bin b/firmware/edid/1440x900.bin new file mode 100644 index 000000000000..03f96af1ba3b Binary files /dev/null and b/firmware/edid/1440x900.bin differ diff --git a/firmware/edid/1600x1200.bin b/firmware/edid/1600x1200.bin new file mode 100644 index 000000000000..369fc35a6464 Binary files /dev/null and b/firmware/edid/1600x1200.bin differ diff --git a/firmware/edid/1600x900.bin b/firmware/edid/1600x900.bin new file mode 100644 index 000000000000..02023c6ae607 Binary files /dev/null and b/firmware/edid/1600x900.bin differ diff --git a/firmware/edid/1680x1050.bin b/firmware/edid/1680x1050.bin new file mode 100644 index 000000000000..3b2a3b050c48 Binary files /dev/null and b/firmware/edid/1680x1050.bin differ diff --git a/firmware/edid/1792x1344.bin b/firmware/edid/1792x1344.bin new file mode 100644 index 000000000000..baf8143d3687 Binary files /dev/null and b/firmware/edid/1792x1344.bin differ diff --git a/firmware/edid/1856x1392_57hz.bin b/firmware/edid/1856x1392_57hz.bin new file mode 100644 index 000000000000..1265fb8177b3 Binary files /dev/null and b/firmware/edid/1856x1392_57hz.bin differ diff --git a/firmware/edid/1920x1080.bin b/firmware/edid/1920x1080.bin new file mode 100644 index 000000000000..e90256c4fd2c Binary files /dev/null and b/firmware/edid/1920x1080.bin differ diff --git a/firmware/edid/1920x1080_23_976hz.bin b/firmware/edid/1920x1080_23_976hz.bin new file mode 100644 index 000000000000..cd865e4b1c5f Binary files /dev/null and b/firmware/edid/1920x1080_23_976hz.bin differ diff --git a/firmware/edid/1920x1080_24hz.bin b/firmware/edid/1920x1080_24hz.bin new file mode 100644 index 000000000000..4856bd539925 Binary files /dev/null and b/firmware/edid/1920x1080_24hz.bin differ diff --git a/firmware/edid/1920x1080_50hz.bin b/firmware/edid/1920x1080_50hz.bin new file mode 100644 index 000000000000..cc1b5fb16a81 Binary files /dev/null and b/firmware/edid/1920x1080_50hz.bin differ diff --git a/firmware/edid/1920x1200_30hz.bin b/firmware/edid/1920x1200_30hz.bin new file mode 100644 index 000000000000..b2b13db1d670 Binary files /dev/null and b/firmware/edid/1920x1200_30hz.bin differ diff --git a/firmware/edid/1920x1200_60hz.bin b/firmware/edid/1920x1200_60hz.bin new file mode 100644 index 000000000000..74bd878e232c Binary files /dev/null and b/firmware/edid/1920x1200_60hz.bin differ diff --git a/firmware/edid/1920x1350.bin b/firmware/edid/1920x1350.bin new file mode 100644 index 000000000000..1e5fe6b18b70 Binary files /dev/null and b/firmware/edid/1920x1350.bin differ diff --git a/firmware/edid/1920x1440_53hz.bin b/firmware/edid/1920x1440_53hz.bin new file mode 100644 index 000000000000..5af8d74470ea Binary files /dev/null and b/firmware/edid/1920x1440_53hz.bin differ diff --git a/firmware/edid/1920x800.bin b/firmware/edid/1920x800.bin new file mode 100644 index 000000000000..dda7700f92ed Binary files /dev/null and b/firmware/edid/1920x800.bin differ diff --git a/firmware/edid/2048x870.bin b/firmware/edid/2048x870.bin new file mode 100644 index 000000000000..35a07dba334f Binary files /dev/null and b/firmware/edid/2048x870.bin differ diff --git a/firmware/edid/2560x1080.bin b/firmware/edid/2560x1080.bin new file mode 100644 index 000000000000..cac497013f6e Binary files /dev/null and b/firmware/edid/2560x1080.bin differ diff --git a/firmware/edid/2560x1440.bin b/firmware/edid/2560x1440.bin new file mode 100644 index 000000000000..e898e263e568 Binary files /dev/null and b/firmware/edid/2560x1440.bin differ diff --git a/firmware/edid/2560x1600.bin b/firmware/edid/2560x1600.bin new file mode 100644 index 000000000000..1c44084c7c6b Binary files /dev/null and b/firmware/edid/2560x1600.bin differ diff --git a/firmware/edid/480x320.bin b/firmware/edid/480x320.bin new file mode 100644 index 000000000000..1dc62233ca16 Binary files /dev/null and b/firmware/edid/480x320.bin differ diff --git a/firmware/edid/480x800.bin b/firmware/edid/480x800.bin new file mode 100644 index 000000000000..87f7e8f7fcaa Binary files /dev/null and b/firmware/edid/480x800.bin differ diff --git a/firmware/edid/640x480.bin b/firmware/edid/640x480.bin new file mode 100644 index 000000000000..4b8d85a269af Binary files /dev/null and b/firmware/edid/640x480.bin differ diff --git a/firmware/edid/720x480.bin b/firmware/edid/720x480.bin new file mode 100644 index 000000000000..e7f5cbb1c53a Binary files /dev/null and b/firmware/edid/720x480.bin differ diff --git a/firmware/edid/720x576.bin b/firmware/edid/720x576.bin new file mode 100644 index 000000000000..9c6cb38a752e Binary files /dev/null and b/firmware/edid/720x576.bin differ diff --git a/firmware/edid/800x480.bin b/firmware/edid/800x480.bin new file mode 100644 index 000000000000..5bed2708823c Binary files /dev/null and b/firmware/edid/800x480.bin differ diff --git a/firmware/edid/800x600.bin b/firmware/edid/800x600.bin new file mode 100644 index 000000000000..74204c27b43a Binary files /dev/null and b/firmware/edid/800x600.bin differ diff --git a/firmware/edid/848x480.bin b/firmware/edid/848x480.bin new file mode 100644 index 000000000000..48cea801e011 Binary files /dev/null and b/firmware/edid/848x480.bin differ