diff --git a/recipes-bsp/u-boot/files/0001-pengwyn-defconfig.patch b/recipes-bsp/u-boot/files/0001-pengwyn-defconfig.patch index 520bd8d..17dcb9f 100644 --- a/recipes-bsp/u-boot/files/0001-pengwyn-defconfig.patch +++ b/recipes-bsp/u-boot/files/0001-pengwyn-defconfig.patch @@ -1209,7 +1209,7 @@ +# +# CONFIG_SOC_TI is not set CONFIG_SPI=y -+# CONFIG_DM_SPI=y ++CONFIG_DM_SPI=y +# CONFIG_SPI_MEM is not set +# CONFIG_ALTERA_SPI is not set +# CONFIG_ATCSPI200_SPI is not set @@ -1275,7 +1275,7 @@ +# CONFIG_TPM_LOAD_KEY_BY_SHA1 is not set +# CONFIG_TPM_LIST_RESOURCES is not set +CONFIG_TPM_V2=y -+# CONFIG_TPM2_TIS_SPI is not set ++CONFIG_TPM2_TIS_SPI=y CONFIG_USB=y +# CONFIG_DM_USB is not set + diff --git a/recipes-bsp/u-boot/files/0002-pengwyn-spi-mux.patch b/recipes-bsp/u-boot/files/0002-pengwyn-spi-mux.patch index 5ffb83e..3baf7b1 100644 --- a/recipes-bsp/u-boot/files/0002-pengwyn-spi-mux.patch +++ b/recipes-bsp/u-boot/files/0002-pengwyn-spi-mux.patch @@ -1,6 +1,8 @@ +diff --git a/board/silica/pengwyn/mux.c b/board/silica/pengwyn/mux.c +index 7583e833ed..06a372d052 100644 --- a/board/silica/pengwyn/mux.c +++ b/board/silica/pengwyn/mux.c -@@ -30,6 +30,17 @@ static struct module_pin_mux i2c0_pin_mux[] = { +@@ -30,6 +30,26 @@ static struct module_pin_mux i2c0_pin_mux[] = { {-1}, }; @@ -14,15 +16,24 @@ + PULLUDEN | PULLUP_EN)}, /* SPI0_CS0 */ + {-1}, +}; ++ ++/* SPI1 pins */ ++static struct module_pin_mux spi1_pin_mux[] = { ++ {OFFSET(ecap0_in_pwm0_out), (MODE(4) | RXACTIVE | PULLUDEN)}, /* SPI1_SCLK */ ++ {OFFSET(mcasp0_fsx), (MODE(3) | RXACTIVE | PULLUDEN | PULLUP_EN)}, /* SPI1_D0 */ ++ {OFFSET(mcasp0_axr0), (MODE(3) | RXACTIVE | PULLUDEN)}, /* SPI1_D1 */ ++ {OFFSET(mcasp0_ahclkr), (MODE(3) | RXACTIVE | PULLUDEN | PULLUP_EN)}, /* SPI1_CS0 */ ++ {-1}, ++}; + /* MMC0 pins */ static struct module_pin_mux mmc0_pin_mux[] = { {OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT3 */ -@@ -90,6 +101,7 @@ void enable_uart0_pin_mux(void) +@@ -90,6 +110,7 @@ void enable_uart0_pin_mux(void) void enable_board_pin_mux() { configure_module_pin_mux(i2c0_pin_mux); -+ configure_module_pin_mux(spi0_pin_mux); ++ configure_module_pin_mux(spi1_pin_mux); configure_module_pin_mux(uart0_pin_mux); configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); diff --git a/recipes-bsp/u-boot/files/0004-redeclaration-compile-error.patch b/recipes-bsp/u-boot/files/0004-redeclaration-compile-error.patch new file mode 100644 index 0000000..dee0339 --- /dev/null +++ b/recipes-bsp/u-boot/files/0004-redeclaration-compile-error.patch @@ -0,0 +1,36 @@ +--- a/drivers/tpm/tpm_tis.h ++++ b/drivers/tpm/tpm_tis.h +@@ -113,19 +113,19 @@ struct tpm_cmd_t { + */ + #define MAX_COUNT_LONG 50 + +-enum tis_access { +- TPM_ACCESS_VALID = 0x80, +- TPM_ACCESS_ACTIVE_LOCALITY = 0x20, +- TPM_ACCESS_REQUEST_PENDING = 0x04, +- TPM_ACCESS_REQUEST_USE = 0x02, +-}; +- +-enum tis_status { +- TPM_STS_VALID = 0x80, +- TPM_STS_COMMAND_READY = 0x40, +- TPM_STS_GO = 0x20, +- TPM_STS_DATA_AVAIL = 0x10, +- TPM_STS_DATA_EXPECT = 0x08, +-}; ++//enum tis_access { ++// TPM_ACCESS_VALID = 0x80, ++// TPM_ACCESS_ACTIVE_LOCALITY = 0x20, ++// TPM_ACCESS_REQUEST_PENDING = 0x04, ++// TPM_ACCESS_REQUEST_USE = 0x02, ++//}; ++// ++//enum tis_status { ++// TPM_STS_VALID = 0x80, ++// TPM_STS_COMMAND_READY = 0x40, ++// TPM_STS_GO = 0x20, ++// TPM_STS_DATA_AVAIL = 0x10, ++// TPM_STS_DATA_EXPECT = 0x08, ++//}; + + #endif diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2020.07.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2020.07.bb index c0ec373..915b2ec 100644 --- a/recipes-bsp/u-boot/u-boot-ti-staging_2020.07.bb +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2020.07.bb @@ -13,6 +13,7 @@ SRC_URI = " \ file://0001-pengwyn-defconfig.patch \ file://0002-pengwyn-spi-mux.patch \ file://0003-pengwyn-add-dts-to-makefile.patch \ + file://0004-redeclaration-compile-error.patch \ file://am335x-pengwyn.dts \ file://uEnv.txt \ "