Commit 7a0988d2 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'dp-vs-hdmi' into 'librem5'

Use DisplayPort on phone and HDMI on Devkit

See merge request !35
parents c2868584 7fec09f5
Pipeline #58199 passed with stage
in 2 minutes and 34 seconds
...@@ -12,6 +12,10 @@ config IMX8MQ ...@@ -12,6 +12,10 @@ config IMX8MQ
bool bool
select IMX8M select IMX8M
config IMX8MQ_DP
depends on IM8MQ
bool "Use iMX8MQ Display Port firmware"
config IMX8MM config IMX8MM
bool bool
select IMX8M select IMX8M
...@@ -61,6 +65,7 @@ config TARGET_LIBREM5 ...@@ -61,6 +65,7 @@ config TARGET_LIBREM5
bool "Purism Librem5 Phone" bool "Purism Librem5 Phone"
select IMX8MQ select IMX8MQ
select IMX8M_LPDDR4 select IMX8M_LPDDR4
select IMX8MQ_DP
config TARGET_LIBREM5_DEVKIT config TARGET_LIBREM5_DEVKIT
bool "Purism Librem5 devkit board" bool "Purism Librem5 devkit board"
......
...@@ -8,7 +8,13 @@ ...@@ -8,7 +8,13 @@
FIT FIT
BOOT_FROM sd BOOT_FROM sd
#ifdef CONFIG_IMX8MQ #ifdef CONFIG_IMX8MQ
SIGNED_HDMI signed_hdmi_imx8m.bin # ifdef CONFIG_IMX8MQ_DP
# warning "Using DP Firmware"
signed_hdmi signed_dp_imx8m.bin
# else
# warning "Using HDMI Firmware"
signed_hdmi signed_hdmi_imx8m.bin
# endif
#endif #endif
LOADER spl/u-boot-spl-ddr.bin 0x7E1000 LOADER spl/u-boot-spl-ddr.bin 0x7E1000
SECOND_LOADER u-boot.itb 0x40200000 0x60000 SECOND_LOADER u-boot.itb 0x40200000 0x60000
......
...@@ -7,7 +7,7 @@ if [ -z "$TARGET" ] && [ -f "${dtmodel}" ]; then ...@@ -7,7 +7,7 @@ if [ -z "$TARGET" ] && [ -f "${dtmodel}" ]; then
"Purism Librem 5 devkit") "Purism Librem 5 devkit")
TARGET="/usr/lib/u-boot/librem5_devkit" TARGET="/usr/lib/u-boot/librem5_devkit"
;; ;;
"Purism Librem 5") "Purism Librem 5"|"Purism Librem 5r"?)
TARGET="/usr/lib/u-boot/librem5" TARGET="/usr/lib/u-boot/librem5"
;; ;;
*) *)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment