{"id":814741,"url":"http://patchwork.ozlabs.org/api/patches/814741/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1505699028-7765-4-git-send-email-aford173@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505699028-7765-4-git-send-email-aford173@gmail.com>","list_archive_url":null,"date":"2017-09-18T01:43:46","name":"[U-Boot,V4,3/5] arm: da850-evm: Enable DM and device tree support for da850-evm","commit_ref":"a4670f8ebb5b4df6afeb5155fb5b44c1d1d154b9","pull_url":null,"state":"accepted","archived":false,"hash":"9d19ad77fdf81afcc30fdd1cc34363d84a8db73b","submitter":{"id":67132,"url":"http://patchwork.ozlabs.org/api/people/67132/?format=json","name":"Adam Ford","email":"aford173@gmail.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1505699028-7765-4-git-send-email-aford173@gmail.com/mbox/","series":[{"id":3552,"url":"http://patchwork.ozlabs.org/api/series/3552/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=3552","date":"2017-09-18T01:43:43","name":"Update DA850 to Device tree, SPI MTDPARTS, and DM","version":4,"mbox":"http://patchwork.ozlabs.org/series/3552/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814741/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814741/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"FK3zXPxn\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwTW35mXyz9sDB\n\tfor ;\n\tMon, 18 Sep 2017 11:51:11 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 9A9F5C21EF8; Mon, 18 Sep 2017 01:45:27 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 3F296C21EDE;\n\tMon, 18 Sep 2017 01:44:08 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 094A6C21C62; Mon, 18 Sep 2017 01:43:59 +0000 (UTC)","from mail-io0-f193.google.com (mail-io0-f193.google.com\n\t[209.85.223.193])\n\tby lists.denx.de (Postfix) with ESMTPS id 4ABEFC21D63\n\tfor ; Mon, 18 Sep 2017 01:43:59 +0000 (UTC)","by mail-io0-f193.google.com with SMTP id d16so7735219ioj.2\n\tfor ; Sun, 17 Sep 2017 18:43:59 -0700 (PDT)","from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net.\n\t[73.65.120.235]) by smtp.gmail.com with ESMTPSA id\n\tn4sm228385ioe.71.2017.09.17.18.43.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSun, 17 Sep 2017 18:43:57 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=saXPgs7aNXBBLDD613XKPRpu8PQVqv4QsWlFOZL1BEM=;\n\tb=FK3zXPxngoXalx04wx4T1WsJYg/3JUo6XJErLXui3lvd1Hs+bcYzBtoje2raPBdG3k\n\tZWwJCcqREIGRnGVECWDExpxW0iqhTIqt2pkt1JqsWb/xhx9+2M2RqWOXjxHVdmc8ZTf5\n\tYJTYe5qc4oS9+RXWfONYjqBOu+cU43v+cImsa/BCVEj0LaxV/uAifyrNz6SEv0x97fgM\n\tMcyvwjlfdFLxNLovrny3+918SbjHfGMW29HgsbQJyHxbY5/uh/XbNNaIV38RISeEm+A0\n\tkPquK/Qs90PeJxszSCE9ZENvYAfGMP2nqYF3iGt2Ya6X3yZqXTKx4Ms7WqDBIVThj+F2\n\tR0yw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=saXPgs7aNXBBLDD613XKPRpu8PQVqv4QsWlFOZL1BEM=;\n\tb=beN8yf+U7vm3gTqVc5niPGUAiQC/z9GrJi1qKZxGVoFrKfFJ/61AnK1FnijL9Zd2TZ\n\tL3ASIegTimzgoDIMH/V4zcvNomF54sUwEuA317zzeak5MEzLcQyDevEfOByLg+ac4PC5\n\tmFJNDYhGO2a+btX8GmJbTv17QVqejiu/Oa/nrb3rlOEdrCZgNkF8fHRW8pfNtZpKqa1K\n\tawAyhkQEumvtAsVGXWiGIVwc8uh3NO+eMlNzpdG8raK9uUdgN8iuZCwcNmosZja6PJ08\n\twRovA4irgV/th9V9bsRImM7NO+RS0Dzy0W7vnHXuI4jZ47LevycFZ5DBV8rVC6NYsduf\n\t/FFQ==","X-Gm-Message-State":"AHPjjUiJdmhZxW8AAGic9iS2nlrmp6IMMnvymZgqLghjbsUgW9GAdI5r\n\trQdM3AaPueVfOnnE","X-Google-Smtp-Source":"AOwi7QBa8zzvEABu+A2fxdEUYj43Di05WViA1F2nXrVVYglQgG0qRZntbBa3K1AOmTzNjayVlUeZDQ==","X-Received":"by 10.107.53.213 with SMTP id k82mr19326639ioo.179.1505699037933;\n\tSun, 17 Sep 2017 18:43:57 -0700 (PDT)","From":"Adam Ford ","To":"u-boot@lists.denx.de","Date":"Sun, 17 Sep 2017 20:43:46 -0500","Message-Id":"<1505699028-7765-4-git-send-email-aford173@gmail.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1505699028-7765-1-git-send-email-aford173@gmail.com>","References":"<1505699028-7765-1-git-send-email-aford173@gmail.com>","Cc":"adam.ford@logicpd.com, jagan@openedev.com","Subject":"[U-Boot] [PATCH V4 3/5] arm: da850-evm: Enable DM and device tree\n\tsupport for da850-evm","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"With the device tree ported and DM compatible drivers, enable:\nOF_CONTROL, DM_SPI, DM_SPI_FLASH and DM_SERIAL\n\nNote: DM_SERIAL is not enabled for da850evm_direct_nor_defconfig\nyet.\n\nReviewed-by: Jagan Teki \nSigned-off-by: Adam Ford \n---\nV4: Fixed isues with da850_am8xxevm and da850evm_direct_nor and resync with master\nV3: No Change","diff":"diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig\nindex bb1188b..e0df97c 100644\n--- a/board/davinci/da8xxevm/Kconfig\n+++ b/board/davinci/da8xxevm/Kconfig\n@@ -33,6 +33,8 @@ config MAC_ADDR_IN_EEPROM\n \n endif\n \n+source \"board/ti/common/Kconfig\"\n+\n endif\n \n if TARGET_OMAPL138_LCDK\ndiff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c\nindex 516d86d..83c9f29 100644\n--- a/board/davinci/da8xxevm/da850evm.c\n+++ b/board/davinci/da8xxevm/da850evm.c\n@@ -60,7 +60,7 @@ static int get_mac_addr(u8 *addr)\n \t\treturn -1;\n \t}\n \n-\tret = spi_flash_read(flash, CFG_MAC_ADDR_OFFSET, 6, addr);\n+\tret = spi_flash_read(flash, (CFG_MAC_ADDR_OFFSET) + 1, 7, addr);\n \tif (ret) {\n \t\tprintf(\"Error - unable to read MAC address from SPI flash.\\n\");\n \t\treturn -1;\n@@ -140,6 +140,7 @@ int misc_init_r(void)\n \tuchar buff[6];\n \n \tspi_mac_read = get_mac_addr(buff);\n+\tbuff[0] = 0;\n \n \t/*\n \t * MAC address not present in the environment\ndiff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig\nindex 27370e7..832c9ce 100644\n--- a/configs/da850_am18xxevm_defconfig\n+++ b/configs/da850_am18xxevm_defconfig\n@@ -1,17 +1,16 @@\n CONFIG_ARM=y\n CONFIG_ARCH_DAVINCI=y\n CONFIG_TARGET_DA850EVM=y\n-CONFIG_TI_COMMON_CMD_OPTIONS=y\n CONFIG_MAC_ADDR_IN_EEPROM=y\n+CONFIG_TI_COMMON_CMD_OPTIONS=y\n CONFIG_SPL_LIBCOMMON_SUPPORT=y\n CONFIG_SPL_LIBGENERIC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"da850-evm\"\n CONFIG_SYS_EXTRA_OPTIONS=\"DA850_AM18X_EVM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50\"\n CONFIG_BOOTDELAY=3\n-CONFIG_USE_BOOTARGS=y\n-CONFIG_BOOTARGS=\"mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp\"\n CONFIG_VERSION_VARIABLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n # CONFIG_DISPLAY_BOARDINFO is not set\n@@ -19,7 +18,7 @@ CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL=y\n CONFIG_SPL_BOARD_INIT=y\n CONFIG_HUSH_PARSER=y\n-# CONFIG_CMD_BOOTZ is not set\n+CONFIG_SYS_PROMPT=\"U-Boot > \"\n # CONFIG_CMD_IMLS is not set\n CONFIG_CRC32_VERIFY=y\n # CONFIG_CMD_EEPROM is not set\n@@ -33,10 +32,14 @@ CONFIG_CRC32_VERIFY=y\n # CONFIG_CMD_EXT4 is not set\n # CONFIG_CMD_FS_GENERIC is not set\n CONFIG_CMD_DIAG=y\n+CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_SPI_FLASH=y\n+CONFIG_DM=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_STMICRO=y\n CONFIG_SPI_FLASH_WINBOND=y\n+CONFIG_DM_SERIAL=y\n CONFIG_SYS_NS16550=y\n+CONFIG_DM_SPI=y\n # CONFIG_FAT_WRITE is not set\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig\nindex bfa5ea1..05dc813 100644\n--- a/configs/da850evm_defconfig\n+++ b/configs/da850evm_defconfig\n@@ -7,9 +7,9 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"da850-evm\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"MAC_ADDR_IN_SPIFLASH\"\n CONFIG_BOOTDELAY=3\n-CONFIG_USE_BOOTARGS=y\n-CONFIG_BOOTARGS=\"mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp\"\n CONFIG_VERSION_VARIABLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n # CONFIG_DISPLAY_BOARDINFO is not set\n@@ -31,10 +31,14 @@ CONFIG_CRC32_VERIFY=y\n # CONFIG_CMD_EXT4 is not set\n # CONFIG_CMD_FS_GENERIC is not set\n CONFIG_CMD_DIAG=y\n+CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_SPI_FLASH=y\n+CONFIG_DM=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_STMICRO=y\n CONFIG_SPI_FLASH_WINBOND=y\n+CONFIG_DM_SERIAL=y\n CONFIG_SYS_NS16550=y\n+CONFIG_DM_SPI=y\n # CONFIG_FAT_WRITE is not set\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig\nindex 24ab892..8f8bad0 100644\n--- a/configs/da850evm_direct_nor_defconfig\n+++ b/configs/da850evm_direct_nor_defconfig\n@@ -2,6 +2,8 @@ CONFIG_ARM=y\n CONFIG_ARCH_DAVINCI=y\n CONFIG_TARGET_DA850EVM=y\n CONFIG_TI_COMMON_CMD_OPTIONS=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"da850-evm\"\n+# CONFIG_SYS_MALLOC_F is not set\n CONFIG_SYS_EXTRA_OPTIONS=\"USE_NOR,DIRECT_NOR_BOOT\"\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n@@ -28,11 +30,14 @@ CONFIG_CRC32_VERIFY=y\n # CONFIG_CMD_FAT is not set\n # CONFIG_CMD_FS_GENERIC is not set\n CONFIG_CMD_DIAG=y\n+CONFIG_OF_CONTROL=y\n CONFIG_ENV_IS_IN_FLASH=y\n+CONFIG_DM=y\n # CONFIG_MMC is not set\n CONFIG_MTD_NOR_FLASH=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_STMICRO=y\n CONFIG_SPI_FLASH_WINBOND=y\n CONFIG_SYS_NS16550=y\n-CONFIG_OF_LIBFDT=y\n+CONFIG_DM_SPI=y\ndiff --git a/include/configs/da850evm.h b/include/configs/da850evm.h\nindex c05c64c..d383c23 100644\n--- a/include/configs/da850evm.h\n+++ b/include/configs/da850evm.h\n@@ -21,6 +21,16 @@\n #endif\n \n /*\n+* Disable DM_* for SPL build and can be re-enabled after adding\n+* DM support in SPL\n+*/\n+#ifdef CONFIG_SPL_BUILD\n+#undef CONFIG_DM_SPI\n+#undef CONFIG_DM_SPI_FLASH\n+#undef CONFIG_DM_I2C\n+#undef CONFIG_DM_I2C_COMPAT\n+#endif\n+/*\n * SoC Configuration\n */\n #define CONFIG_MACH_DAVINCI_DA850_EVM\n@@ -130,18 +140,23 @@\n /*\n * Serial Driver info\n */\n+\n+#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_DIRECT_NOR_BOOT)\n #define CONFIG_SYS_NS16550_SERIAL\n #define CONFIG_SYS_NS16550_REG_SIZE\t-4\t/* NS16550 register size */\n #define CONFIG_SYS_NS16550_COM1\tDAVINCI_UART2_BASE /* Base address of UART2 */\n+#endif\n #define CONFIG_SYS_NS16550_CLK\tclk_get(DAVINCI_UART2_CLKID)\n #define CONFIG_CONS_INDEX\t1\t\t/* use UART0 for console */\n \n #define CONFIG_SPI\n #define CONFIG_DAVINCI_SPI\n-#define CONFIG_SYS_SPI_BASE\t\tDAVINCI_SPI1_BASE\n #define CONFIG_SYS_SPI_CLK\t\tclk_get(DAVINCI_SPI1_CLKID)\n+#ifdef CONFIG_SPL_BUILD\n+#define CONFIG_SYS_SPI_BASE\t\tDAVINCI_SPI1_BASE\n #define CONFIG_SF_DEFAULT_SPEED\t\t30000000\n #define CONFIG_ENV_SPI_MAX_HZ\tCONFIG_SF_DEFAULT_SPEED\n+#endif\n \n #ifdef CONFIG_USE_SPIFLASH\n #define CONFIG_SPL_SPI_LOAD\n@@ -257,7 +272,29 @@\n #define CONFIG_CMDLINE_TAG\n #define CONFIG_REVISION_TAG\n #define CONFIG_SETUP_MEMORY_TAGS\n-#define CONFIG_EXTRA_ENV_SETTINGS\t\"hwconfig=dsp:wake=yes\"\n+\n+#define CONFIG_BOOTCOMMAND \\\n+\t\t\"run envboot; \" \\\n+\t\t\"run mmcboot; \"\n+\n+#define DEFAULT_LINUX_BOOT_ENV \\\n+\t\"loadaddr=0xc0700000\\0\" \\\n+\t\"fdtaddr=0xc0600000\\0\" \\\n+\t\"scriptaddr=0xc0600000\\0\"\n+\n+#include \n+\n+#define CONFIG_EXTRA_ENV_SETTINGS \\\n+\tDEFAULT_LINUX_BOOT_ENV \\\n+\tDEFAULT_MMC_TI_ARGS \\\n+\t\"bootpart=0:2\\0\" \\\n+\t\"bootdir=/boot\\0\" \\\n+\t\"bootfile=zImage\\0\" \\\n+\t\"fdtfile=da850-evm.dtb\\0\" \\\n+\t\"boot_fdt=yes\\0\" \\\n+\t\"boot_fit=0\\0\" \\\n+\t\"console=ttyS2,115200n8\\0\" \\\n+\t\"hwconfig=dsp:wake=yes\"\n \n #ifdef CONFIG_CMD_BDI\n #define CONFIG_CLOCKS\n","prefixes":["U-Boot","V4","3/5"]}