From 0f0e16a1f84002407c954dba36e47cb90e2f6b82 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 13 Sep 2018 15:41:40 +0200 Subject: libsoc: imx6, imx7 and tegra and auto board config support Update to latest git for imx6, imx7 and tegra support and integrate automatic board configuration support. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- .../libsoc/0001-libsoc-use-sane-board-naming.patch | 552 +++++++++++++++++++++ recipes-support/libsoc/libsoc_0.8.2.bbappend | 53 +- 2 files changed, 597 insertions(+), 8 deletions(-) create mode 100644 recipes-support/libsoc/libsoc/0001-libsoc-use-sane-board-naming.patch diff --git a/recipes-support/libsoc/libsoc/0001-libsoc-use-sane-board-naming.patch b/recipes-support/libsoc/libsoc/0001-libsoc-use-sane-board-naming.patch new file mode 100644 index 0000000..647b64b --- /dev/null +++ b/recipes-support/libsoc/libsoc/0001-libsoc-use-sane-board-naming.patch @@ -0,0 +1,552 @@ +From 78220a93d091d18c9b1c77beb82a220202b4e48e Mon Sep 17 00:00:00 2001 +Message-Id: <78220a93d091d18c9b1c77beb82a220202b4e48e.1536887613.git.marcel.ziswiler@toradex.com> +From: Marcel Ziswiler +Date: Fri, 14 Sep 2018 03:09:16 +0200 +Subject: [PATCH] libsoc: use sane board naming + +Use board naming as per our OpenEmbedded machine naming. The Wi-Fi SKU +of our Colibri iMX6ULL may need run-time aka postinst handling. + +Signed-off-by: Marcel Ziswiler +--- + contrib/board_files/colibri-imx6ullwb.conf | 95 ------ + ...olibri-imx7-1GB.conf => colibri-imx7-emmc.conf} | 4 +- + .../{colibri-imx7-512mb.conf => colibri-imx7.conf} | 4 +- + .../{colibri-vf61.conf => colibri-vf.conf} | 7 +- + contrib/board_files/colibri-vf50.conf | 355 --------------------- + 5 files changed, 8 insertions(+), 457 deletions(-) + delete mode 100644 contrib/board_files/colibri-imx6ullwb.conf + rename contrib/board_files/{colibri-imx7-1GB.conf => colibri-imx7-emmc.conf} (94%) + rename contrib/board_files/{colibri-imx7-512mb.conf => colibri-imx7.conf} (94%) + rename contrib/board_files/{colibri-vf61.conf => colibri-vf.conf} (95%) + delete mode 100644 contrib/board_files/colibri-vf50.conf + +diff --git a/contrib/board_files/colibri-imx6ullwb.conf b/contrib/board_files/colibri-imx6ullwb.conf +deleted file mode 100644 +index ed30cbf..0000000 +--- a/contrib/board_files/colibri-imx6ullwb.conf ++++ /dev/null +@@ -1,95 +0,0 @@ +-# Toradex Colibri iMX6ULLWB Computer On Module. +-# http://developer.toradex.com/products/colibri-imx6ullwb +- +-[board] +-dtfile = /proc/device-tree/model +-model = Toradex Colibri iMX6ULLWB on Colibri Evaluation Board +- +-[GPIO] +-###Colibri IMX6ULLWB SODIMM number to GPIO number mapping +- +-SODIMM_2 = 9 +-SODIMM_4 = 8 +-SODIMM_6 = 1 +-SODIMM_8 = 0 +-SODIMM_19 = 4 +-SODIMM_21 = 5 +-SODIMM_23 = 12 +-SODIMM_25 = 18 +-SODIMM_27 = 19 +-SODIMM_28 = 112 +-SODIMM_29 = 87 +-SODIMM_30 = 37 +-SODIMM_31 = 13 +-SODIMM_32 = 22 +-SODIMM_33 = 16 +-SODIMM_34 = 23 +-SODIMM_35 = 17 +-SODIMM_36 = 20 +-SODIMM_37 = 88 +-SODIMM_38 = 21 +-SODIMM_43 = 128 +-SODIMM_44 = 65 +-SODIMM_45 = 129 +-SODIMM_46 = 76 +-SODIMM_47 = 49 +-SODIMM_48 = 78 +-SODIMM_49 = 51 +-SODIMM_50 = 80 +-SODIMM_51 = 52 +-SODIMM_52 = 81 +-SODIMM_53 = 53 +-SODIMM_54 = 82 +-SODIMM_55 = 32 +-SODIMM_56 = 64 +-SODIMM_57 = 85 +-SODIMM_58 = 72 +-SODIMM_59 = 107 +-SODIMM_60 = 71 +-SODIMM_61 = 86 +-SODIMM_62 = 77 +-SODIMM_63 = 33 +-SODIMM_64 = 84 +-SODIMM_65 = 124 +-SODIMM_66 = 83 +-SODIMM_67 = 38 +-SODIMM_68 = 66 +-SODIMM_69 = 121 +-SODIMM_70 = 70 +-SODIMM_71 = 11 +-SODIMM_72 = 74 +-SODIMM_73 = 36 +-SODIMM_74 = 79 +-SODIMM_75 = 113 +-SODIMM_76 = 69 +-SODIMM_77 = 25 +-SODIMM_78 = 73 +-SODIMM_80 = 75 +-SODIMM_82 = 67 +-SODIMM_85 = 123 +-SODIMM_86 = 90 +-SODIMM_88 = 89 +-SODIMM_90 = 92 +-SODIMM_92 = 91 +-SODIMM_95 = 131 +-SODIMM_96 = 114 +-SODIMM_98 = 122 +-SODIMM_99 = 14 +-SODIMM_100 = 26 +-SODIMM_102 = 15 +-SODIMM_104 = 39 +-SODIMM_105 = 138 +-SODIMM_106 = 10 +-SODIMM_107 = 132 +-SODIMM_129 = 2 +-SODIMM_131 = 133 +-SODIMM_133 = 110 +-SODIMM_135 = 24 +-SODIMM_137 = 130 +-SODIMM_178 = 34 +-SODIMM_186 = 27 +-SODIMM_188 = 35 +-SODIMM_190 = 48 +-SODIMM_192 = 50 +-SODIMM_194 = 29 +-SODIMM_196 = 28 +diff --git a/contrib/board_files/colibri-imx7-1GB.conf b/contrib/board_files/colibri-imx7-emmc.conf +similarity index 94% +rename from contrib/board_files/colibri-imx7-1GB.conf +rename to contrib/board_files/colibri-imx7-emmc.conf +index e9b172a..bf891af 100644 +--- a/contrib/board_files/colibri-imx7-1GB.conf ++++ b/contrib/board_files/colibri-imx7-emmc.conf +@@ -3,10 +3,10 @@ + + [board] + dtfile = /proc/device-tree/model +-model = Toradex Colibri iMX7 on Colibri Evaluation Board ++model = Toradex Colibri iMX7 1GB (eMMC) on Colibri Evaluation Board + + [GPIO] +-###Colibri IMX7 SODIMM number to GPIO number mapping ++###Colibri IMX7 1GB (eMMC) SODIMM number to GPIO number mapping + + SODIMM_19 = 101 + SODIMM_21 = 100 +diff --git a/contrib/board_files/colibri-imx7-512mb.conf b/contrib/board_files/colibri-imx7.conf +similarity index 94% +rename from contrib/board_files/colibri-imx7-512mb.conf +rename to contrib/board_files/colibri-imx7.conf +index aaac582..d3b4257 100644 +--- a/contrib/board_files/colibri-imx7-512mb.conf ++++ b/contrib/board_files/colibri-imx7.conf +@@ -3,10 +3,10 @@ + + [board] + dtfile = /proc/device-tree/model +-model = Toradex Colibri iMX7 on Colibri Evaluation Board ++model = Toradex Colibri iMX7 512MB on Colibri Evaluation Board + + [GPIO] +-###Colibri IMX7 SODIMM number to GPIO number mapping ++###Colibri IMX7 512MB SODIMM number to GPIO number mapping + + SODIMM_19 = 101 + SODIMM_21 = 100 +diff --git a/contrib/board_files/colibri-vf61.conf b/contrib/board_files/colibri-vf.conf +similarity index 95% +rename from contrib/board_files/colibri-vf61.conf +rename to contrib/board_files/colibri-vf.conf +index 2292ade..bac6364 100644 +--- a/contrib/board_files/colibri-vf61.conf ++++ b/contrib/board_files/colibri-vf.conf +@@ -1,12 +1,13 @@ +-# Toradex Colibri VF61 Computer On Module. ++# Toradex Colibri VF50/VF61 Computer On Module. ++# http://developer.toradex.com/products/colibri-vf50 + # http://developer.toradex.com/products/colibri-vf61 + + [board] + dtfile = /proc/device-tree/model +-model = Toradex Colibri VF61 on Colibri Evaluation Board ++model = Toradex Colibri VF50/VF61 on Colibri Evaluation Board + + [GPIO] +-### Colibri VF61 SODIMM number to GPIO number mapping ++### Colibri VF50/VF61 SODIMM number to GPIO number mapping + + SODIMM_19 = 27 + SODIMM_21 = 26 +diff --git a/contrib/board_files/colibri-vf50.conf b/contrib/board_files/colibri-vf50.conf +deleted file mode 100644 +index 3f73753..0000000 +--- a/contrib/board_files/colibri-vf50.conf ++++ /dev/null +@@ -1,355 +0,0 @@ +-# Toradex Colibri VF50 Computer On Module. +-# http://developer.toradex.com/products/colibri-vf50 +- +-[board] +-dtfile = /proc/device-tree/model +-model = Toradex Colibri VF50 on Colibri Evaluation Board +- +-[GPIO] +-### Colibri VF50 SODIMM number to GPIO number mapping +- +-SODIMM_19 = 27 +-SODIMM_21 = 26 +-SODIMM_22 = 104 +-SODIMM_23 = 10 +-SODIMM_24 = 25 +-SODIMM_25 = 35 +-SODIMM_27 = 34 +-SODIMM_28 = 30 +-SODIMM_29 = 21 +-SODIMM_30 = 23 +-SODIMM_31 = 11 +-SODIMM_32 = 82 +-SODIMM_33 = 33 +-SODIMM_34 = 81 +-SODIMM_35 = 32 +-SODIMM_36 = 80 +-SODIMM_37 = 20 +-SODIMM_38 = 79 +-SODIMM_43 = 42 +-SODIMM_44 = 109 +-SODIMM_45 = 41 +-SODIMM_46 = 121 +-SODIMM_47 = 14 +-SODIMM_48 = 123 +-SODIMM_49 = 17 +-SODIMM_50 = 125 +-SODIMM_51 = 18 +-SODIMM_52 = 112 +-SODIMM_53 = 19 +-SODIMM_54 = 113 +-SODIMM_55 = 39 +-SODIMM_56 = 107 +-SODIMM_57 = 116 +-SODIMM_58 = 131 +-SODIMM_59 = 22 +-SODIMM_59# = 52 +-SODIMM_60 = 130 +-SODIMM_61 = 117 +-SODIMM_62 = 122 +-SODIMM_63 = 38 +-SODIMM_64 = 115 +-SODIMM_65 = 40 +-SODIMM_66 = 114 +-SODIMM_67 = 31 +-SODIMM_67# = 51 +-SODIMM_68 = 105 +-SODIMM_69 = 64 +-SODIMM_70 = 129 +-SODIMM_71 = 45 +-SODIMM_72 = 133 +-SODIMM_73 = 43 +-SODIMM_74 = 124 +-SODIMM_75 = 91 +-SODIMM_76 = 128 +-SODIMM_77 = 44 +-SODIMM_78 = 132 +-SODIMM_79 = 49 +-SODIMM_80 = 120 +-SODIMM_81 = 29 +-SODIMM_82 = 106 +-SODIMM_85 = 53 +-SODIMM_86 = 84 +-SODIMM_88 = 87 +-SODIMM_89 = 2 +-SODIMM_90 = 85 +-SODIMM_92 = 86 +-SODIMM_93 = 98 +-SODIMM_94 = 28 +-SODIMM_95 = 103 +-SODIMM_96 = 134 +-SODIMM_97 = 50 +-SODIMM_98 = 46 +-SODIMM_99 = 65 +-SODIMM_100 = 92 +-SODIMM_101 = 47 +-SODIMM_102 = 93 +-SODIMM_103 = 48 +-SODIMM_104 = 66 +-SODIMM_105 = 96 +-SODIMM_106 = 63 +-SODIMM_107 = 67 +-SODIMM_127 = 68 +-SODIMM_129 = 83 +-SODIMM_131 = 108 +-SODIMM_133 = 88 +-SODIMM_134 = 7 +-SODIMM_135 = 89 +-SODIMM_136 = 126 +-SODIMM_137 = 102 +-SODIMM_138 = 127 +-SODIMM_140 = 118 +-SODIMM_142 = 119 +-SODIMM_144 = 110 +-SODIMM_146 = 111 +-SODIMM_184 = 69 +-SODIMM_186 = 70 +-SODIMM_188 = 90 +-SODIMM_190 = 15 +-SODIMM_192 = 16 +-SODIMM_194 = 37 +-SODIMM_196 = 36 +- +-### Colibri Evaluation Board location to GPIO mapping +- +-# (X9) +-X9_12 = 25 +-X9_11 = 104 +-X9_13 = 109 +-X9_4 = 41 +-X9_28 = 112 +-X9_27 = 125 +-X9_25 = 123 +-X9_23 = 121 +-X9_30 = 113 +-X9_5 = 39 +-X9_42 = 107 +-X9_33 = 116 +-X9_18 = 131 +-X9_17 = 130 +-X9_34 = 117 +-X9_24 = 122 +-X9_6 = 38 +-X9_32 = 115 +-X9_31 = 114 +-X9_44 = 105 +-X9_16 = 129 +-X9_46 = 45 +-X9_20 = 133 +-X9_26 = 124 +-X9_14 = 128 +-X9_19 = 132 +-X9_21 = 120 +-X9_45 = 106 +-X9_7 = 92 +-X9_9 = 93 +-X9_35 = 126 +-X9_37 = 127 +-X9_38 = 118 +-X9_39 = 119 +-X9_47 = 37 +-X9_48 = 36 +-X9_41 = 111 +-X9_10 = 66 +-X9_40 = 110 +- +-# (X10) +-X10_2 = 27 +-X10_3 = 26 +-X10_4 = 10 +-X10_5 = 35 +-X10_6 = 34 +-X10_27 = 30 +-X10_7 = 21 +-X10_28 = 23 +-X10_9 = 11 +-X10_30 = 82 +-X10_19 = 33 +-X10_14 = 81 +-X10_11 = 32 +-X10_16 = 80 +-X10_12 = 20 +-X10_17 = 79 +-X10_18 = 42 +-X10_19 = 14 +-X10_23 = 17 +-X10_24 = 18 +-X10_25 = 19 +-X10_26 = 22 +-X10_26# = 52 +-X10_30 = 31 +-X10_30# = 51 +-X10_31 = 43 +-X10_32 = 84 +-x10_33 = 87 +-X10_34 = 85 +-X10_35 = 86 +-X10_37 = 96 +-X10_42 = 68 +-X10_38 = 67 +-X10_47 = 83 +-X10_48 = 108 +-X10_41 = 88 +-X10_39 = 63 +-X10_40 = 89 +-X10_49 = 102 +-X10_20 = 15 +-X10_21 = 16 +- +-# (X22) +-X22_14 = 40 +-X22_21 = 64 +-X22_3 = 91 +-X22_22 = 44 +-X22_9 = 49 +-X22_6 = 29 +-X22_13 = 53 +-X22_5 = 28 +-X22_4 = 134 +-X22_10 = 50 +-X22_18 = 46 +-X22_7 = 47 +-X22_8 = 48 +- +-# EX A +-EX_A_26 = 2 +-EX_A_28 = 98 +-EX_A_31 = 65 +-EX_A_27 = 96 +-EX_A_32 = 88 +-EX_A_23 = 126 +-EX_A_22 = 127 +-EX_A_22 = 118 +-EX_A_21 = 111 +-EX_A_20 = 90 +- +-# EX B +-EX_B_28 = 103 +-EX_B_26 = 67 +-EX_B_23 = 7 +-EX_B_21 = 110 +-EX_B_20 = 70 +- +-# EX C +-EX_C_27 = 63 +-EX_C_32 = 68 +-EX_C_31 = 89 +-EX_C_21 = 119 +-EX_C_20 = 69 +- +-### Colibri Aster Carrier Board location to GPIO mapping +- +-# Extension Connector (X20) +-# This extension connector pinout is compatible with header pins available on +-# the Raspberry Pi, Type B+ board. +-# NOTE: Some of these functions might change depending on the Colibri module that is used. +-X20_32 = 30 +-# Via R127 +-x20_27 = 21 +-X20_33 = 23 +-X20_36 = 82 +-X20_11 = 81 +-X20_10 = 80 +-# Via R128 +-X20_28 = 20 +-X20_8 = 79 +-# Via R120 +-X20_12 = 22 +-X20_24 = 40 +-# Via R122 +-X20_35 = 31 +-# Via R124 +-X20_40 = 64 +-X20_15 = 45 +-X20_38 = 91 +-X20_37 = 49 +-X20_31 = 29 +-x20_26 = 84 +-X20_23 = 87 +-X20_21 = 85 +-X20_19 = 86 +-X20_29 = 28 +-X20_7 = 134 +-X20_13 = 50 +-X20_16 = 46 +-# Via R125 +-X20_40 = 92 +-X20_22 = 47 +-X20_18 = 48 +-# Via R121 +-X20_12 = 89 +-# Via R123 +-X20_35 = 90 +-X20_3 = 37 +-# Via R126 +-#X20_12 = 37 +-X20_5 = 36 +-# Via R129 +-#X20_28 = 36 +- +-# Arduino Shield header: Digital I/OPins (X17) +-UNO_GPIO1 = 41 +-UNO_GPIO2 = 31 +-UNO_GPIO2# = 51 +-UNO_GPIO3 = 88 +-UNO_GPIO4 = 30 +-UNO_GPIO5 = 23 +-UNO_GPIO6 = 39 +-UNO_GPIO7 = 38 +-UNO_GPIO8 = 22 +-UNO_GPIO8# = 52 +-UNO_SPI_MOSI = 86 +-UNO_SPI_MISO = 85 +-UNO_SPI_SCK = 87 +-UNO_I2C_SDA = 37 +-UNO_I2C_SCL = 36 +- +-### Colibri Iris Carrier Board location to GPIO mapping +- +-# Extension Connctor (X16) +-X16_5 = 37 +-X16_6 = 36 +-X16_8 = 87 +-X16_9 = 84 +-X16_10 = 85 +-X16_11 = 86 +-X16_13 = 46 +-X16_14 = 88 +-X16_15 = 48 +-X16_16 = 47 +-X16_17 = 50 +-X16_18 = 53 +-X16_19 = 49 +-X16_20 = 41 +-X16_37 = 22 +-X16_37# = 52 +-X16_38 = 30 +-X16_39 = 23 +-X16_40 = 31 +-X16_40# = 51 +- +-### Colibri Viola Carrier Board location to GPIO mapping +- +-# Extension Connector (X9) +-X9_42 = 30 +-X9_16 = 41 +-X9_17 = 39 +-X9_41 = 22 +-X9_18 = 38 +-X9_44 = 31 +-X9_44# = 51 +-X9_15 = 49 +-X9_14 = 53 +-X9_13 = 50 +-X9_9 = 46 +-X9_12 = 47 +-X9_11 = 48 +-X9_10 = 88 +-X9_8 = 89 +- +-# (X10) +-X10_8 = 29 +-X10_9 = 28 +-X10_10 = 134 +-X10_11 = 40 +-X10_12 = 91 +-- +2.14.4 + diff --git a/recipes-support/libsoc/libsoc_0.8.2.bbappend b/recipes-support/libsoc/libsoc_0.8.2.bbappend index 8899d6f..397b7ba 100644 --- a/recipes-support/libsoc/libsoc_0.8.2.bbappend +++ b/recipes-support/libsoc/libsoc_0.8.2.bbappend @@ -1,10 +1,47 @@ -# Last release 0.8.2 doesn't include the latest colibri-vf confs -SRCREV = "577917c01fa5d8b06c224745c4328070f7e28f97" +FILESEXTRAPATHS_prepend := "${THISDIR}/libsoc:" -#BOARD = "colibri-vf61" -PACKAGECONFIG = "allboardconfigs python" +PACKAGE_ARCH = "${MACHINE_ARCH}" -#PACKAGECONFIG[disabledebug] = "--disable-debug,," -#PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," -#PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -#PACKAGECONFIG[python] = "--enable-python=${PYTHON_PN},,${PYTHON_PN}" +SRCREV = "9a97d260379856940a5de9862ef06803de82cca8" + +SRC_URI += " \ + file://0001-libsoc-use-sane-board-naming.patch \ +" + +BOARD_apalis-imx6 = "apalis-imx6" +BOARD_apalis-t30 = "apalis-t30" +BOARD_apalis-tk1 = "apalis-tk1" +BOARD_apalis-tk1-mainline = "apalis-tk1" +BOARD_colibri-imx6 = "colibri-imx6" +BOARD_colibri-imx6ull = "colibri-imx6ull" +BOARD_colibri-imx7 = "colibri-imx7" +BOARD_colibri-imx7-emmc = "colibri-imx7-emmc" +BOARD_colibri-t20 = "colibri-t20" +BOARD_colibri-t30 = "colibri-t30" +BOARD_colibri-vf = "colibri-vf" + +PACKAGECONFIG_apalis-imx6 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_apalis-t30 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_apalis-tk1 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_apalis-tk1_mainline = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-imx6 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-imx6ull = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-imx7 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-imx7-emmc = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-t20 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-t30 = "allboardconfigs enableboardconfig python" +PACKAGECONFIG_colibri-vf = "allboardconfigs enableboardconfig python" + +pkg_postinst_${PN}_colibri-imx6ull () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + IS_WIFI_DTB=`grep -c toradex,colibri_imx6ull-wifi /proc/device-tree/compatible` + if [ $IS_WIFI_DTB -gt 0 ]; then + mv -f ${datadir}/libsoc/colibri-imx6ull.conf ${datadir}/libsoc/colibri-imx6ull.conf.bak + # SODIMM pins missing on Wi-Fi SKU + cat ${datadir}/libsoc/colibri-imx6ull.conf.bak | grep -E -v "(SODIMM_79|SODIMM_81|SODIMM_89|SODIMM_93|SODIMM_94|SODIMM_97|SODIMM_101|SODIMM_103|SODIMM_127|SODIMM_138)" > ${datadir}/libsoc/colibri-imx6ull.conf + rm -f ${datadir}/libsoc/colibri-imx6ull.conf.bak + fi +} -- cgit v1.2.3