summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Convert all of CONFIG_CONS_INDEX to KconfigTom Rini2018-03-16320-281/+181
| | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CONS_INDEX We have existing entries for this option in a number of places, with different guards on them. They're also sometimes used for things not directly inside of the serial driver. First, introduce a new symbol to guard the use of CONFIG_CONS_INDEX, so that in the case where we don't need this for the serial driver, but for some other use, we can still do it. Next, consolidate all of these into the single entry in drivers/serial/Kconfig. Finally, introduce CONS_INDEX_[023456] so that we can imply a correct value here to make the defconfig side of this smaller. Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Rework a lot of the logic here, such that I took authorship from Adam, but kept his S-o-B line] Signed-off-by: Tom Rini <trini@konsulko.com>
* dra7xx: Always enable UART1 and UART3 in early_padconfTom Rini2018-03-161-3/+0
| | | | | | | | | | It is safe to always setup the pinmux for UART1 and UART3 to be used in early_padconf and then if these pins are needed later on, they will be re-muxed. This allows us to drop the usage of CONFIG_CONS_INDEX here. Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* dm: MIGRATION: Add migration plan for DM_SPI & DM_SPI_FLASHJagan Teki2018-03-161-0/+35
| | | | | | | | | | | | Due to adding various new functionalities with SPI and SPI-FLASH subsystems which are rounding in Mailing list for year these long term supporting spi driver which never seen any update with driver-model conversion. So added migration plan for DM_SPI and DM_SPI_FLASH with deadline v2018.09 Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* defconfig: k2l_hs_evm: Add k2l_hs_evm_defconfigMadan Srinivas2018-03-162-0/+44
| | | | | | | | | | | | | | | | Adds a dedicated defconfig to build TI K2L secure devices and updates MAINTAINERS. k2l_hs_evm_defconfig is created from the k2l_evm_defconfig and removes support for SPL, as SPL is not supported on K2 HS devices. Corrects SYS_TEXT_BASE for HS devices. Also adds TI_SECURE_DEVICE and FIT_IMAGE_POST_PROCESS to include support for secure image creation and authentication Signed-off-by: Madan Srinivas <madans@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Andrew F. Davis <afd@ti.com>
* configs: k2l: Updates u-boot env to install secure boot monitorMadan Srinivas2018-03-161-0/+9
| | | | | | | | | | This patch updates the default u-boot env for K2L HS devices to install the secure boot monitor and load the fitImage during boot. Signed-off-by: Madan Srinivas <madans@ti.com> Acked-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* watchdog: omap_wdt: improve watchdog reset pathRuslan Bilovol2018-03-161-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove busy looping during watchdog reset. Each polling of W_PEND_WTGR bit ("finish posted write") after watchdog reset takes 120-140us on BeagleBone Black board. Current U-Boot code has watchdog resets in random places and often there is situation when watchdog is reset few times in a row in nested functions. This adds extra delays and slows the whole system. Instead of polling W_PEND_WTGR bit, we skip watchdog reset if the bit is set. Anyway, watchdog is in the middle of reset *right now*, so we can just return. This noticeably increases performance of the system. Below are some measurements on BBB: - DFU upload over USB 15% faster - fastboot image upload 3x times faster - USB ep0 transfers with 4k packets 20% faster Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com> Tested-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
* board: am335x: Set serial# variableSam Protsenko2018-03-161-0/+10
| | | | | | | | | | | | | | | serial# variable is needed to show the device correctly in "fastboot devices" output. It's useful when we have several devices (in fastboot mode) connected to single host and want to choose which one to flash. We can't use omap_die_id_serial() for this, because AM335x lacks DIE_ID, as can be seen from AM335x TRM. Let's do next: - reuse board_serial variable (obtained from EEPROM in set_board_info_env() function) to set serial# - if board_serial is "unknown", reuse ethaddr variable to set serial# Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* clk: at91: clk-system: add set/get_rate operationsWenyou Yang2018-03-161-0/+26
| | | | | | To support set/get the clock rate, add set/get_rate operations. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
* clk: at91: add PLLADIV driverWenyou Yang2018-03-162-1/+89
| | | | | | | | As said in the SAMA5D2 datasheet, the PLLA clock must be divided by 2 by writing the PLLADIV2 bit in PMC_MCKR, if the ratio between PCK and MCK is 3 (MDIV = 3). This is the purpose of the driver. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
* clk: at91: add USB Host clock driverWenyou Yang2018-03-164-0/+161
| | | | | | | | Add USB clock driver to configure the input clock and the divider in the PMC_USB register to generate a 48MHz and a 12MHz signal to the USB Host OHCI. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
* Merge git://git.denx.de/u-boot-uniphierTom Rini2018-03-1510-13/+146
|\
| * ARM: dts: uniphier: sync with Linux 4.16-rc5Masahiro Yamada2018-03-159-2/+135
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: change load addresses for bigger kernel imageMasahiro Yamada2018-03-151-8/+8
| | | | | | | | | | | | | | | | | | | | The kernel size is getting bigger and bigger. Because the Android common kernel is even bigger than the vanilla one, so images overlap in the current memory layout. Adjust the load address for a bigger kernel image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: increase the firmware size in update command environmentMasahiro Yamada2018-03-151-3/+3
| | | | | | | | | | | | | | If a bigger EL32 is used, fip.bin can be larger than the currently assumed boot firmware size. Adjust the update commands. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | Merge git://git.denx.de/u-boot-spiTom Rini2018-03-159-115/+35
|\ \ | |/ |/|
| * omap3_logic: Enable DM_SPIAdam Ford2018-03-141-0/+1
| | | | | | | | | | | | | | | | | | With the introduction of ("Boards,Need,to,Switch,DM] spi: omap3_spi: Full dm conversion"), Driver Model for McSPI is now available on the omap3. This enables the config by default on omap3_logic boards. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * spi: omap3: Fix redeclared errorJagan Teki2018-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | omap3_spi_set_speed|mode redeclared bus symbol, fix the same. error: drivers/spi/omap3_spi.c: In function ‘omap3_spi_set_speed’: drivers/spi/omap3_spi.c:650:18: error: ‘bus’ redeclared as different kind of symbol struct udevice *bus = dev->parent; Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * arm: sunxi: Move spl spi sunxi code to mach-sunxiJagan Teki2018-03-135-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | This SUNXI variant SPL SPI code doesn't use either SPI or SPL_FLASG subsystems due to size constraints and also placing this code in drivers/mtd/spi will unnecessary build SPI_FLASH code(if defined) which never required, hence moved to arch area. And also renamed the file according to kconfig which resembles proper name. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: omap3: Skip set_mode, set_speed from claimJagan Teki2018-03-131-5/+16
| | | | | | | | | | | | | | | | set_mode, set_seed functions has separate function pointers in dm_spi_ops, so use them in relevent one instead of calling from claim_bus. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: atcspi200: Drop non-dm codeJagan Teki2018-03-132-94/+7
| | | | | | | | | | | | | | | | Boards adp-ae3xx_defconfig, nx25-ae250_defconfig already enabled DM_SPI, so non-dm code make no use of it hence droped. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* | .travis.yml: Add lzopTom Rini2018-03-141-0/+1
| | | | | | | | | | | | | | We need lzop now in order to make some FIT images that use LZO compression on the contents. Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge git://git.denx.de/u-boot-sunxiTom Rini2018-03-14159-160/+442
|\ \
| * | sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigsAndre Przywara2018-03-14128-127/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") made CONFIG_SYS_TEXT_BASE a proper Kconfig variable, with the consequence of moving the common definition shared by almost every sunxi board into 123 individual defconfig files. But the U-Boot start address for Allwinner boards is a platform decision which has been around for ages, so defining it in each *board* config file seems a bit over the top. Define the standard values (160MB into DRAM for most SoCs, with two SoC exceptions) if ARCH_SUNXI is selected, and delete the lines from the individual defconfigs. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | sunxi: Add A20-SOM204-EVB-eMMC boardStefan Mavrodiev2018-03-134-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A20-SOM204 board has option with onboard 16GB eMMC. The chip is wired to MMC2 slot. This patch adds defconfig and dts files for this board. The dts is same with mainline kernel. Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | sunxi: Add A20-SOM204-EVB boardStefan Mavrodiev2018-03-134-0/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is new System-On-Module platform with universal dimm socket for easy insertation. The EVB board is designed to be universal with future modules. Base features of A20-SOM204 board includes: * 1GB DDR3 RAM * AXP209 PMU * KSZ9031 Gigabit PHY * AT24C16 EEPROM * Status LED * LCD connector * GPIO connector There will be variants with the following options: * Second LAN8710A Megabit PHY * 16MB SPI Flash memory * eMMC card * ATECC508 crypto device The EVB board has: * Debug UART * MicroSD card connector * USB-OTG connector * Two USB host * RTL8723BS WiFi/BT combo * IrDA transceiver/receiver * HDMI connector * VGA connector * Megabit ethernet transceiver * Gigabit ethernet transceiver * SATA connector * CAN driver * CSI camera * MIC and HP connectors * PCIe x4 connector * USB3 connector * Two UEXT connectors * Two user LEDs Some of the features are multiplexed and cannot be used the same time: CAN and Megabit PHY. Others are not usable with A20 SoC: PCIe and USB3. This patch adds defconfig and dts files for this board. The dts is same with mainline kernel, except some nodes are removed to make file compatible with existing dtsi file. Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | Move CONFIG_PHY_ADDR to KconfigStefan Mavrodiev2018-03-1319-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PHY_ADDR is used for old-style configuration. This makes impossible changing the PHY address, if multiple boards share a same config header file (for example include/configs/sunxi-common.h). Moving this to Kconfig helps overcoming this issue. It's defined as entry inside PHYLIB section. After the implemention, moveconfig was run. The issues are: - edb9315a - CONFIG_PHYLIB is not enabled. Entry is deleted. - ds414 - CONFIG_PHYLIB is in incompatible format: { 0x1, 0x0 }. This entry is also deleted. - devkit3250 - The PHY_ADDR is in hex format (0x1F). Manually CONFIG_PHY_ADDR=31 is added in the defconfig. After the changes the suspicious defconfigs passes building. Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> [jagan: rebased on master] Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | net: sun8i_emac: Fix PHY initializationSamuel Holland2018-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code tried to update the PHY parameters without waiting for autonegotiation to complete. This caused wrong values to be written to the EMAC in sun8i_adjust_link(). As a result, any commands that called eth_start() before autonegotiation completed would find the network nonfunctional. Fix this by using the correct function to start up the PHY. Signed-off-by: Samuel Holland <samuel@sholland.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | ARM: sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as wellTuomas Tynkkynen2018-03-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In README.sunxi64 we tell the user how to optionally create u-boot-sunxi-with-spl.bin by manually running cat. Instead, have the build system create the file automatically just like it does for 32-bit sunxi boards. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | ARM: sunxi: Move u-boot-sunxi-with-spl.bin rule to MakefileTuomas Tynkkynen2018-03-132-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to need this logic for 64-bit builds as well, so move it out from under arch/arm/cpu/armv7. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | mmc: sunxi: support cd-invertedHeinrich Schuchardt2018-03-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CONFIG_DM_MMC the BananaPi does not detect SD cards. The sunxi device trees use the cd-inverted property to indicate that the card detect is inverted. This property is documented in Linux kernel devicetree/bindings/mmc/mmc.txt The property is not marked as deprecated. A similar patch was posted by Tuomas but is in status "Changes Requested". https://patchwork.ozlabs.org/patch/850377/ This patch is a stripped down version of his patch. Suggested-by: Tuomas Tynkkynen <tuomas@tuxera.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | sunxi: Add reg property for USB OTG node in sun8i-a83t.dtsiChen-Yu Tsai2018-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OTG node was added, its reg property for its address space was missing. With commit f4f9896ac310 ("musb: sunxi: Use base address from device tree"), the OTG controller's address is derived from the device tree exclusively. The missing property results in U-boot crashing when MUSB is initialized. Fixes: b0bea6678981 ("sunxi: Add USB and R_PIO nodes to sun8i-a83t.dtsi") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@openedev.com>
| * | sunxi: Pine64: temporarily remove extra Pine64 non-plus DTAndre Przywara2018-03-131-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the merge of the new u-boot.itb size check now the build for pine64_plus_defconfig breaks, as this file gets too large: ============= u-boot.itb exceeds file size limit: limit: 516096 bytes actual: 521852 bytes excess: 5756 bytes make: *** [u-boot.itb] Error 1 ============= One easily fixable reason is that we actually have two .dtbs in our FIT image, one for the regular Pine64+ board, and one for the non-plus version. The only difference U-Boot cares about is the 100Mbit Ethernet PHY used on the non-plus version, however Ethernet isn't enabled in the non-plus DT anyway. So we could avoid the non-plus special handling, and remove that extra .dtb from the FIT image, which saves a few KBs and brings us back below the limit. The Pine64 would boot with a Pine64+ .dtb, and would fail to enable Ethernet. Given that it didn't work in the first place, this is not a regression. Once we switch to a non-MMC environment, we can bring this back, then with a proper .dtb and hopefully working Ethernet. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
* | common/memsize.c: restore content of the base addressPatrick Delaunay2018-03-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | For the last return of function get_ram_size(), when size=maxsize, restore the base address (*base) content. Add comment for the remaining case to avoid regression: this case is already correctly handled. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* | common/memsize.c: prepare get_ram_size updatePatrick Delaunay2018-03-131-3/+4
| | | | | | | | | | | | | | | | | | Save the content of the base address in a new variable in stack (save_base) to prepare restore this content. This patch don't modified code behavior and stack usage. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* | configs: am335x_boneblack: Enable fastboot flash capabilitySam Protsenko2018-03-131-0/+2
| | | | | | | | | | | | Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* | omap: Fix AM335x build with enabled fastboot flashSam Protsenko2018-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabling CONFIG_FASTBOOT_FLASH in am335x_boneblack_defconfig, next build errors and warnings occur: arch/arm/mach-omap2/utils.c: In function ‘omap_set_fastboot_cpu’: arch/arm/mach-omap2/utils.c:26:16: warning: implicit declaration of function ‘omap_revision’ [-Wimplicit-function-declaration] u32 cpu_rev = omap_revision(); ^~~~~~~~~~~~~ arch/arm/mach-omap2/utils.c:29:7: error: ‘DRA762_ES1_0’ undeclared (first use in this function) Include asm/omap_common.h explicitly to avoid those. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* | ARM: dts: dra7x: Make pinctrl and IOdelays for MMC2 available in SPLJean-Jacques Hiblot2018-03-134-0/+80
| | | | | | | | | | | | | | | | The SPL can't use high speed MMC modes if the associated pinctrl and IOdelays are described in the DTS. Make them available in SPL by tagging the nodes with 'u-boot,dm-spl;' Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | configs: dra7xx_evm: Enable support for the HS200 mmc mode in the SPLJean-Jacques Hiblot2018-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Beside enabling the support for HS200 in mmc core, enabling the HS200 support in the SPL requires multi-dtb support in the SPL because pinctrl and IOdelays vary across SOCs. Also we need to make sure that the pinctrl properties arenot removed from the dts by setting CONFIG_OF_SPL_REMOVE_PROPS to remove only clocks and interrupts properties. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | ARM: dts: dra76-evm: shift to using common IOdelay dataJean-Jacques Hiblot2018-03-131-43/+8
| | | | | | | | | | | | | | | | | | Now that we have a device-tree include file with common MMC/SD IOdelay data for DRA76x SoC, shift the EVM device-tree file to using that. Also fix the name of the IO voltage regulator for mmc1. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | ARM: dts: dra76x: create a common file with MMC/SD IOdelay dataJean-Jacques Hiblot2018-03-131-0/+285
| | | | | | | | | | | | | | | | | | | | | | | | Add a common device-tree include file with MMC/SD IOdelay data for DRA76x SoC based on the linux DTSI file. In the most common case, IOdelay data available in datamanual can directly be used. This file caters to that common case. Data is based on DRA76x datamanual, SPRS993A, revised July 2017. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | ARM: omap3: evm: Sync with omap3_beagle configurationDerald D. Woods2018-03-132-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does the following for OMAP3 EVM: - Track omap3_beagle changes where possible - Remove CONFIG_SYS_MPUCLK and CONFIG_MTD which are not needed for the default board configuration to work. - Remove CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_MALLOC_F_LEN from default config. CONFIG_SYS_MALLOC_F_LEN=0x400 is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y] - Use updated NAND layout: device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 ------------------------------------------------- Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
* | ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layoutDerald D. Woods2018-03-132-112/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does the following for BeagleBoard{-xM}: - Enable DM_SERIAL which also enables SPL_DM_SERIAL - Misc. config updates in support of DM_SERIAL - Use updated NAND layout (BeagleBoard): device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 ------------------------------------------------- - Use MMC and UBIFS support from config_distro_bootcmd.h - Use LEGACY_MMC and NAND support defined in omap3_beagle.h [MMC(0:1)/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-fat label omap3-beagle-mmc-fat kernel /zImage fdt /omap3-beagle.dtb append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ---8<------------------------------------------------------------------- [LEGACY_MMC(0:2)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-ext4 label omap3-beagle-mmc-ext4 kernel /boot/zImage fdt /boot/omap3-beagle.dtb append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ---8<------------------------------------------------------------------- [UBIFS(ubi0:rootfs)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-nand-ubifs label omap3-beagle-nand-ubifs kernel /boot/zImage fdt /boot/omap3-beagle.dtb append console=ttyO2,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs rootfstype=ubifs rootwait ---8<------------------------------------------------------------------- The board's 'bootcmd' can also be overridden with: CONFIG_BOOTCOMMAND="run findfdt; run mmcboot" CONFIG_BOOTCOMMAND="run findfdt; run nandboot" CONFIG_BOOTCOMMAND="run findfdt; run ramboot" or CONFIG_BOOTCOMMAND="run findfdt; run somethingelse" The use of 'run findfdt' is required. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
* | ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board fileDerald D. Woods2018-03-131-0/+8
| | | | | | | | | | | | | | | | BeagleBoard 'xM' does not really have NAND. CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT can/should be empty for 'xM'. This commit sets the defined values if they exist. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
* | env: ti: boot: Get rid of magic numbersSam Protsenko2018-03-131-6/+4
| | | | | | | | | | | | | | | | Get the start address and the size of partitions using partition names rather than partition numbers. This way we can change the partition table further without changing the boot code. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* | cmd: part: Extract common code to separate functionSam Protsenko2018-03-131-38/+23
| | | | | | | | | | | | | | | | Refactor the code for "part start" and "part size" commands to avoid code duplication. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Lukasz Majewski <lukma@denx.de>
* | cmd: part: Allow passing partition name to start and sizeSam Protsenko2018-03-131-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow passing the partition name to "part start" and "part size" commands, so we can avoid magic numbers in the environment. Consider one real use-case: in include/environment/ti/boot.h we have commands like these: setenv boot_part 9 part start mmc ${mmcdev} ${boot_part} boot_start part size mmc ${mmcdev} ${boot_part} boot_size mmc read ${loadaddr} ${boot_start} ${boot_size} Now suppose that we have changed the partition table and boot_part now is 10. We will need to fix commands above. And anyone who relies on these boot commands, will need to change them accordingly, too (this was an actual case in our lab while testing Linux boot on Android environment). By providing the option to pass partition name instead, we fix mentioned issue, by eliminating the necessity to use magic numbers. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Lukasz Majewski <lukma@denx.de>
* | test/py: highlight warnings in the log summaryStephen Warren2018-03-133-3/+50
| | | | | | | | | | | | | | | | | | | | Currently, if a test emits a warning message but otherwise passes, there's no indication of this in the log summary, which can lead to warnings being missed. Enhance the test logic to explicitly mention warnings in otherwise passing tests, and not to collapse the log sections for tests with warnings, so that they're more easily seen when scanning the log. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | test/py: add MMC/SD block read testStephen Warren2018-03-131-0/+129
| | | | | | | | | | | | | | | | Add a standalone MMC block read test. This allows direct testing of MMC access rather than relying on doing so as a side-effect of e.g. DFU or UMS testing, which may not be enabled on all platforms. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part: use common api to lookup part driverKever Yang2018-03-131-20/+17
| | | | | | | | | | | | | | | | | | Do not need to scan disk every time when we get part info by name. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [trini: Fix build in !CONFIG_HAVE_BLOCK_DEVICE case] Signed-off-by: Tom Rini <trini@konsulko.com>
* | disk: part: scan the disk if the part_type is unknownKever Yang2018-03-131-6/+18
| | | | | | | | | | | | | | | | | | If a DUT do not have partition table, and we write one with 'gpt write' cmd, we should able to list the partition with 'part list' cmd. It's reasonable to scan the disk again if the initial part_type is unknown in case we just write a new one into disk. Signed-off-by: Kever Yang <kever.yang@rock-chips.com>