6 years agoMerge branch 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot into 6AO.1.0 6AO.1.0
Merge branch 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot into 6AO.1.0
* 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot:
dra7x: fastboot: Increase boot partition size
Signed-off-by: Buddy Liong <a0270631@ti.com>
* 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot:
dra7x: fastboot: Increase boot partition size
Signed-off-by: Buddy Liong <a0270631@ti.com>
dra7x: fastboot: Increase boot partition size
The current boot partition size is not enough for
booting HS boards with ift images. Increase the boot
partition size to match the recovery partition size.
Change-Id: I15a5ef83ba64a2803f7836dec79b158016482a1d
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
The current boot partition size is not enough for
booting HS boards with ift images. Increase the boot
partition size to match the recovery partition size.
Change-Id: I15a5ef83ba64a2803f7836dec79b158016482a1d
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ti: dra76: Remove Vin1a_fld conflicting with VOUT1 HDMI power
For Dual HDMI use case, the VOUT1 port is connected to the onboard
HDMI chip which converts parallel video to HDMI.
For this to work, GPIO3_1 needs to be driven as the same is connected
for the power_on signal for this chip.
This pad conflicts with the VIN1A_FLD0 signal used for camera on the
JAMR board.
We do not need the FLD signal for vin1a for any JAMR use case
Hence remove this pinmux to solve the conflict and enable VOUT1 HDMI
Change-Id: Icea1a31dc2d8427a78b4ac563f649be420aef4cb
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
For Dual HDMI use case, the VOUT1 port is connected to the onboard
HDMI chip which converts parallel video to HDMI.
For this to work, GPIO3_1 needs to be driven as the same is connected
for the power_on signal for this chip.
This pad conflicts with the VIN1A_FLD0 signal used for camera on the
JAMR board.
We do not need the FLD signal for vin1a for any JAMR use case
Hence remove this pinmux to solve the conflict and enable VOUT1 HDMI
Change-Id: Icea1a31dc2d8427a78b4ac563f649be420aef4cb
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
ARM: DRA7: Add clock fixup for DSP on dra76x
On DRA76x, DSP clock frequency for OPP_HIGH has
been increased.
Change-Id: Ic3908e1d205d4f8d6872f05481beb90f046bb426
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
On DRA76x, DSP clock frequency for OPP_HIGH has
been increased.
Change-Id: Ic3908e1d205d4f8d6872f05481beb90f046bb426
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
ARM: DRA7: Add OPP_PLUS for GPU
on DRA76x, GPU has an additional OPP called as OPP_PLUS
For highest performance, set OPP_PLUS as default.
Change-Id: I1bd385643dd9f973453953aa921d54ba49ff9de6
Signed-off-by: Subhajit Paul <subhajit_paul@ti.com>
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
on DRA76x, GPU has an additional OPP called as OPP_PLUS
For highest performance, set OPP_PLUS as default.
Change-Id: I1bd385643dd9f973453953aa921d54ba49ff9de6
Signed-off-by: Subhajit Paul <subhajit_paul@ti.com>
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Revert "arm: dra7: Define board specific boot arguments"
This reverts commit e2648f3da001b2df4a7654c6c59e28ada0472e6c.
For dra7xx evms these bootarg parameters are already defined
in kernel commandline, remove it to avoid duplication.
Conflicts:
include/configs/dra7xx_evm.h
Change-Id: I111b47eb9e2e7ebc4a79a83d15b22b665f5d0859
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
This reverts commit e2648f3da001b2df4a7654c6c59e28ada0472e6c.
For dra7xx evms these bootarg parameters are already defined
in kernel commandline, remove it to avoid duplication.
Conflicts:
include/configs/dra7xx_evm.h
Change-Id: I111b47eb9e2e7ebc4a79a83d15b22b665f5d0859
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ti: dra76: mux_data: Add pinmux for VIN1A for JAMR3
In DRA76 EVM, video ports from expansion ports are connected
to vin1a (same as DRA7-EVM)
This is different than all previous boards where the expansion
video is muxed with onbaord LI camera.
By default, pinmux for LI camera (VIN2a) is added
we need to add pinmux for expansion video port (VIN1A) explicitly
Change-Id: I19882423c5c94850605e55f004dff86113797fa8
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
In DRA76 EVM, video ports from expansion ports are connected
to vin1a (same as DRA7-EVM)
This is different than all previous boards where the expansion
video is muxed with onbaord LI camera.
By default, pinmux for LI camera (VIN2a) is added
we need to add pinmux for expansion video port (VIN1A) explicitly
Change-Id: I19882423c5c94850605e55f004dff86113797fa8
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
ti: dra76: mux_data: Add pinmux for JAMR use cases
Add pinmux for McASP, i2c4 and atl
i2c4 is needed for TVP capture
McASP and ATL is needed for Radio and multi channel audio
Change-Id: I09074be8aea349a93630282e5b0a23028c6ea13a
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Add pinmux for McASP, i2c4 and atl
i2c4 is needed for TVP capture
McASP and ATL is needed for Radio and multi channel audio
Change-Id: I09074be8aea349a93630282e5b0a23028c6ea13a
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
dra7x: fastboot: Increase recovery partition size
As per current android recommendation
https://source.android.com/devices/architecture/kernel/modular-kernels
1. Android recovery mode should contain both SOC and ODM
kernel modules in the recovery partition.
2. If a kernel module is required both in recovery and normal boot
mode, the module has to be located in recovery and vendor
partition seperately.
3. Kernel modules used in recovery mode should be independent
of vendor and odm partition
4. Recovery image should contain atleast
storage, display, keypad, battery and pmic modules.
Due to these requirements, recovery image size has increased
to >10MB.
This patch is to increase recovery partition size for TI devices
so that we dont see such flashing error
log:
sending 'recovery' (12560 KB)...
OKAY [ 0.436s]
writing 'recovery'...
FAILED (remote: too large for partition)
finished. total time: 0.458s
Change-Id: Ie76093c497cca864704e5c62f1304929c7c834c3
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
As per current android recommendation
https://source.android.com/devices/architecture/kernel/modular-kernels
1. Android recovery mode should contain both SOC and ODM
kernel modules in the recovery partition.
2. If a kernel module is required both in recovery and normal boot
mode, the module has to be located in recovery and vendor
partition seperately.
3. Kernel modules used in recovery mode should be independent
of vendor and odm partition
4. Recovery image should contain atleast
storage, display, keypad, battery and pmic modules.
Due to these requirements, recovery image size has increased
to >10MB.
This patch is to increase recovery partition size for TI devices
so that we dont see such flashing error
log:
sending 'recovery' (12560 KB)...
OKAY [ 0.436s]
writing 'recovery'...
FAILED (remote: too large for partition)
finished. total time: 0.458s
Change-Id: Ie76093c497cca864704e5c62f1304929c7c834c3
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
omap-common: fastboot: extend cpu type for DRA76x rev 1.0
dra76 family is a high-performance, infotainment application
device, based on OMAP architecture on a 28-nm technology.
This contains most of the subsystems, peripherals that are
available on dra74, dra72 family.
This patch extends support for DRA76x to "getvar cpu" command
Change-Id: I14ac3dd1da0f0d3f70d55f816d25a63f6de5a89d
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
dra76 family is a high-performance, infotainment application
device, based on OMAP architecture on a 28-nm technology.
This contains most of the subsystems, peripherals that are
available on dra74, dra72 family.
This patch extends support for DRA76x to "getvar cpu" command
Change-Id: I14ac3dd1da0f0d3f70d55f816d25a63f6de5a89d
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
omap-common: fastboot: update cpu device name
update cpu device name to recommended convention.
Used by "fastboot getvar cpu" command to detect and
flash the right device definition to the designated
android partition.
Change-Id: I2fda7ff8ee14eb3b51731db58dbb01090a6b8a19
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
update cpu device name to recommended convention.
Used by "fastboot getvar cpu" command to detect and
flash the right device definition to the designated
android partition.
Change-Id: I2fda7ff8ee14eb3b51731db58dbb01090a6b8a19
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
Auto Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
board: ti: dra7xx: Fix iodelay execution sequence
board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM
Signed-off-by: David Huang <d-huang@ti.com>
Auto Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
board: ti: dra7xx: Fix iodelay execution sequence
board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM
Signed-off-by: David Huang <d-huang@ti.com>
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
board: ti: dra7xx: Fix iodelay execution sequence
board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
board: ti: dra7xx: Fix iodelay execution sequence
board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
board: ti: dra7xx: Fix iodelay execution sequence
commit 2f2928878591 ("board: ti: dra7xx: Fix iodelay execution sequence") branch ti-u-boot-2017.01
commit c3ca2d1a40877 ("board: ti: dra7xx: Select MCAN instead
of DCAN on DRA76 EVM") selects MCAN pinmux. As part of this commit,
iodelay_start() sequence is moved before pads selection. Once this
start sequence is called, SoC will be in isolated state. On DRA71 EVM
NAND pins are selected based on an i2c read, which will fail
as SoC is in isolation. Also subsequent i2c reads/writes on the same
bus are timedout(failing avs programming). Fix it by calling
the iodelay_start() sequence just before configuring pinmux.
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Franklin S Cooper Jr. <fcooper@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 2f2928878591 ("board: ti: dra7xx: Fix iodelay execution sequence") branch ti-u-boot-2017.01
commit c3ca2d1a40877 ("board: ti: dra7xx: Select MCAN instead
of DCAN on DRA76 EVM") selects MCAN pinmux. As part of this commit,
iodelay_start() sequence is moved before pads selection. Once this
start sequence is called, SoC will be in isolated state. On DRA71 EVM
NAND pins are selected based on an i2c read, which will fail
as SoC is in isolation. Also subsequent i2c reads/writes on the same
bus are timedout(failing avs programming). Fix it by calling
the iodelay_start() sequence just before configuring pinmux.
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Franklin S Cooper Jr. <fcooper@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM
commit c3ca2d1a4087 ("board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM") branch ti-u-boot-2017.01
MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance
to use if any at all is done through
CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is
handled in U-boot. Handle this additional pinmuxing requirement in U-boot
to insure that MCAN is used by default via the DCAN1 pins.
Signed-off-by: Vignesh R <vigneshr@ti.com>
[fcooper@ti.com: Update commit message and use DCAN1 not DCAN2 for MCAN]
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit c3ca2d1a4087 ("board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM") branch ti-u-boot-2017.01
MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance
to use if any at all is done through
CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is
handled in U-boot. Handle this additional pinmuxing requirement in U-boot
to insure that MCAN is used by default via the DCAN1 pins.
Signed-off-by: Vignesh R <vigneshr@ti.com>
[fcooper@ti.com: Update commit message and use DCAN1 not DCAN2 for MCAN]
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
omap-common: fastboot: extend cpu type for DRA71x rev 2.1
DRA71x processors are reduced pin and software compatible
derivative of DRA72 processors. Extend support for this
revision in "getvar cpu" command.
Change-Id: If5428cf75bee4da228a9e7ded5168fc1b9153377
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
DRA71x processors are reduced pin and software compatible
derivative of DRA72 processors. Extend support for this
revision in "getvar cpu" command.
Change-Id: If5428cf75bee4da228a9e7ded5168fc1b9153377
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
spl: dra7xx: early boot: add error message
display a descriptive error message in case the number of level 2 page
table entries is insufficient for the current binary.
Change-Id: I592ab048b1109caefcd8cdc5c491a7f036503642
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
display a descriptive error message in case the number of level 2 page
table entries is insufficient for the current binary.
Change-Id: I592ab048b1109caefcd8cdc5c491a7f036503642
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
spl: dra7xx: early boot: code cleanup
- tie the size of the page table area set aside for each core
to a macro.
Size of page table is now PAGE_TABLE_SIZE instead of 32 KB hard
coded earlier. This allows us to increase the page table size if we
need more memory for L2 page tables.
- modify the page table location for each core so that there is
no overlap between the regions.
The setup in u-boot now matches the kernel device tree setup. We
only have to specify the base address of the page table region
using the macro DRA7_PGTBL_BASE_ADDR. All page table locations are
calculated by incrementing the base address appropriately.
Change-Id: I8bad0780fcd90c679a144264c0dc5fd770ac5106
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
- tie the size of the page table area set aside for each core
to a macro.
Size of page table is now PAGE_TABLE_SIZE instead of 32 KB hard
coded earlier. This allows us to increase the page table size if we
need more memory for L2 page tables.
- modify the page table location for each core so that there is
no overlap between the regions.
The setup in u-boot now matches the kernel device tree setup. We
only have to specify the base address of the page table region
using the macro DRA7_PGTBL_BASE_ADDR. All page table locations are
calculated by incrementing the base address appropriately.
Change-Id: I8bad0780fcd90c679a144264c0dc5fd770ac5106
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
spl: dra7xx: early boot: handle watchdog timer for DSP2
Timer 13 has been added as watchdog timer for DSP2. Handle the same in
MLO for early boot/late attach.
Change-Id: I4c155fc51be0acec5b1ad754c46adcc93ee3752d
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
Timer 13 has been added as watchdog timer for DSP2. Handle the same in
MLO for early boot/late attach.
Change-Id: I4c155fc51be0acec5b1ad754c46adcc93ee3752d
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
ti: dra71: Add J6entry vision pinmux
Add pinmux data for J6entry when used with vision board.
This enables all vin1a, vin1b, vin2a, vin2b ports in 8bit mode
and sets up the required iodelay configuration.
Change-Id: I9c749e8274a9f7335fc0d713ec4b19cc1e13f3b7
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Add pinmux data for J6entry when used with vision board.
This enables all vin1a, vin1b, vin2a, vin2b ports in 8bit mode
and sets up the required iodelay configuration.
Change-Id: I9c749e8274a9f7335fc0d713ec4b19cc1e13f3b7
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
ti: dra72: mux_data: Fix vision pinmux
On DRA72x platform, adding vision pinmux would disable
one of the ethernet port
But in RevC onwards boards, another ethernet port can be used
as an alternative.
For this, the vision pinmux needs to be done after the ethernet
pads are configured (Some of the vision pads will overwrite ethernet pads)
Change-Id: Icb4ee461ff9a82b2a2edb53c2ad043b70ed22be9
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
On DRA72x platform, adding vision pinmux would disable
one of the ethernet port
But in RevC onwards boards, another ethernet port can be used
as an alternative.
For this, the vision pinmux needs to be done after the ethernet
pads are configured (Some of the vision pads will overwrite ethernet pads)
Change-Id: Icb4ee461ff9a82b2a2edb53c2ad043b70ed22be9
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
am57x: android: add vendor partition
Add a new vendor parition for Android
Change-Id: Ib63926fe6a6423fc97a49306bb927225003c5827
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Add a new vendor parition for Android
Change-Id: Ib63926fe6a6423fc97a49306bb927225003c5827
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
ARM: dts: dra76-evm: add higher speed MMC/SD modes
ARM: dts: dra76-evm: shift to using common IOdelay data
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
ARM: DRA72x: Add support for detection of DRA71x SR 2.1
Change-Id: I6e100695a70d55683a66bf8c8430e5245831e6dc
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
ARM: dts: dra76-evm: add higher speed MMC/SD modes
ARM: dts: dra76-evm: shift to using common IOdelay data
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
ARM: DRA72x: Add support for detection of DRA71x SR 2.1
Change-Id: I6e100695a70d55683a66bf8c8430e5245831e6dc
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
ARM: dts: dra76-evm: add higher speed MMC/SD modes
ARM: dts: dra76-evm: shift to using common IOdelay data
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
ARM: DRA72x: Add support for detection of DRA71x SR 2.1
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
ARM: dts: dra76-evm: add higher speed MMC/SD modes
ARM: dts: dra76-evm: shift to using common IOdelay data
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
ARM: DRA72x: Add support for detection of DRA71x SR 2.1
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
commit 8fbc46c73738 ("arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 8fbc46c73738 ("arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ARM: dts: dra76-evm: add higher speed MMC/SD modes
commit 2f4f581cb1a0 ("ARM: dts: dra76-evm: add higher speed MMC/SD modes") branch ti-u-boot-2017.01
The SD card interface on DRA76x EVM can support
high speed SD cards. The eMMC onboard can support
up to HS200 mode.
Enable support for these higher speed modes in the
device-tree file.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 2f4f581cb1a0 ("ARM: dts: dra76-evm: add higher speed MMC/SD modes") branch ti-u-boot-2017.01
The SD card interface on DRA76x EVM can support
high speed SD cards. The eMMC onboard can support
up to HS200 mode.
Enable support for these higher speed modes in the
device-tree file.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ARM: dts: dra76-evm: shift to using common IOdelay data
commit e685f74757bb ("ARM: dts: dra76-evm: shift to using common IOdelay data") branch ti-u-boot-2017.01
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.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit e685f74757bb ("ARM: dts: dra76-evm: shift to using common IOdelay data") branch ti-u-boot-2017.01
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.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
commit 0651917fe691 ("ARM: dts: dra76x: create a common file with MMC/SD IOdelay data") branch ti-u-boot-2017.01
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>
commit 0651917fe691 ("ARM: dts: dra76x: create a common file with MMC/SD IOdelay data") branch ti-u-boot-2017.01
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: DRA72x: Add support for detection of DRA71x SR 2.1
commit c130009298ef6503e906a2bfed150dbb5f0ff381 branch ti-u-boot-2017.01
DRA71x processors are reduced pin and software compatible
derivative of DRA72 processors. Add support for detection
of SR2.1 version of DRA71x family of processors.
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit c130009298ef6503e906a2bfed150dbb5f0ff381 branch ti-u-boot-2017.01
DRA71x processors are reduced pin and software compatible
derivative of DRA72 processors. Add support for detection
of SR2.1 version of DRA71x family of processors.
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
dra7xx: android: add vendor partition
Add a new vendor parition for Android
Change-Id: Ib77ad4ee5582a128c802628df58d85b975eab5f9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Add a new vendor parition for Android
Change-Id: Ib77ad4ee5582a128c802628df58d85b975eab5f9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
fastboot: sparse: remove session-id logic
commit 64ece84854ae49f40e9b9d4d88502247774f9d2f upstream.
This "session-id" alogrithm is not required, and currently corrupts
the stored image whenever more the one "session" is required.
Conflicts:
common/fb_mmc.c
Change-Id: Icd660c17515e885a00a4cf1d48acab1d84e688f7
Signed-off-by: Steve Rae <srae@broadcom.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
commit 64ece84854ae49f40e9b9d4d88502247774f9d2f upstream.
This "session-id" alogrithm is not required, and currently corrupts
the stored image whenever more the one "session" is required.
Conflicts:
common/fb_mmc.c
Change-Id: Icd660c17515e885a00a4cf1d48acab1d84e688f7
Signed-off-by: Steve Rae <srae@broadcom.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
ARM: dts: dra76-evm: Add initial support
ARM: dts: dra7-evm: sync DT with Linux
configs: ti_omap5_common: Select dtb name for dra76
board: ti: dra76-evm: Add support for powering on mmc ldo
board: ti: dra76-evm: Add the pinmux data
board: ti: dra76-evm: Add DDR data
board: ti: dra76-evm: Add the pmic data
board: ti: dra76-evm: Add epprom support
arm: dra76: Add support for ES1.0 detection
configs: dra7xx: Enable LP87565 related configs
power: regulator: palmas: Add smps12 dual regulator for tps65917
power: regulator: lp87565: add regulator support
power: pmic: lp87565: Add the basic pmic support
palmas: Add support for powering different ldos
arm: omap5+: Add board specific ldo powering
spi: ti_qspi: Fix baudrate divider calculation
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Conflicts:
configs/dra7xx_evm_defconfig
Change-Id: I05447e3e5dab5bcad0dd0469579d95f293563c97
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
ARM: dts: dra76-evm: Add initial support
ARM: dts: dra7-evm: sync DT with Linux
configs: ti_omap5_common: Select dtb name for dra76
board: ti: dra76-evm: Add support for powering on mmc ldo
board: ti: dra76-evm: Add the pinmux data
board: ti: dra76-evm: Add DDR data
board: ti: dra76-evm: Add the pmic data
board: ti: dra76-evm: Add epprom support
arm: dra76: Add support for ES1.0 detection
configs: dra7xx: Enable LP87565 related configs
power: regulator: palmas: Add smps12 dual regulator for tps65917
power: regulator: lp87565: add regulator support
power: pmic: lp87565: Add the basic pmic support
palmas: Add support for powering different ldos
arm: omap5+: Add board specific ldo powering
spi: ti_qspi: Fix baudrate divider calculation
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Conflicts:
configs/dra7xx_evm_defconfig
Change-Id: I05447e3e5dab5bcad0dd0469579d95f293563c97
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
ARM: dts: dra76-evm: Add initial support
ARM: dts: dra7-evm: sync DT with Linux
configs: ti_omap5_common: Select dtb name for dra76
board: ti: dra76-evm: Add support for powering on mmc ldo
board: ti: dra76-evm: Add the pinmux data
board: ti: dra76-evm: Add DDR data
board: ti: dra76-evm: Add the pmic data
board: ti: dra76-evm: Add epprom support
arm: dra76: Add support for ES1.0 detection
configs: dra7xx: Enable LP87565 related configs
power: regulator: palmas: Add smps12 dual regulator for tps65917
power: regulator: lp87565: add regulator support
power: pmic: lp87565: Add the basic pmic support
palmas: Add support for powering different ldos
arm: omap5+: Add board specific ldo powering
spi: ti_qspi: Fix baudrate divider calculation
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
ARM: dts: dra76-evm: Add initial support
ARM: dts: dra7-evm: sync DT with Linux
configs: ti_omap5_common: Select dtb name for dra76
board: ti: dra76-evm: Add support for powering on mmc ldo
board: ti: dra76-evm: Add the pinmux data
board: ti: dra76-evm: Add DDR data
board: ti: dra76-evm: Add the pmic data
board: ti: dra76-evm: Add epprom support
arm: dra76: Add support for ES1.0 detection
configs: dra7xx: Enable LP87565 related configs
power: regulator: palmas: Add smps12 dual regulator for tps65917
power: regulator: lp87565: add regulator support
power: pmic: lp87565: Add the basic pmic support
palmas: Add support for powering different ldos
arm: omap5+: Add board specific ldo powering
spi: ti_qspi: Fix baudrate divider calculation
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
ARM: dts: dra76-evm: Add initial support
Add initial dts support for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Add initial dts support for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ARM: dts: dra7-evm: sync DT with Linux
Syncrhonized dts with 4.4 Linux
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Syncrhonized dts with 4.4 Linux
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
configs: ti_omap5_common: Select dtb name for dra76
Select dtb name for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Select dtb name for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra76-evm: Add support for powering on mmc ldo
ldo4 is used to poweron mmc on dra76-evm. Enable it.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ldo4 is used to poweron mmc on dra76-evm. Enable it.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra76-evm: Add the pinmux data
Adding pinmux and IODELAY data for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Adding pinmux and IODELAY data for dra76-evm.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra76-evm: Add DDR data
dra76-evm has the ddr parts connectedi running at 666MHz:
EMIF1: MT41K512M16HA-125 AIT:A x 2
EMIF2: MT41K512M8RH-125-AAT:E x 4
Add support for configuring the above DDR parts.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
dra76-evm has the ddr parts connectedi running at 666MHz:
EMIF1: MT41K512M16HA-125 AIT:A x 2
EMIF2: MT41K512M8RH-125-AAT:E x 4
Add support for configuring the above DDR parts.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra76-evm: Add the pmic data
dra76-evm uses lp8736 and tps65917 pmic for powering on
various peripherals. Add data for these pmics and register
for dra76-evm.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
dra76-evm uses lp8736 and tps65917 pmic for powering on
various peripherals. Add data for these pmics and register
for dra76-evm.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra76-evm: Add epprom support
The dra76-evm is a board based on TI's DRA76 processor
Add eeprom support
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
The dra76-evm is a board based on TI's DRA76 processor
Add eeprom support
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
arm: dra76: Add support for ES1.0 detection
dra76 family is a high-performance, infotainment application
device, based on OMAP architecture on a 28-nm technology.
This contains most of the subsystems, peripherals that are
available on dra74, dra72 family. This SoC mainly features
Subsystems:
- 2 x Cortex-A15 with max speed of 1.8GHz
- 2 X DSP
- 2 X Cortex-M4 IPU
- ISS
- CAL
- DSS
- VPE
- VIP
Connectivity peripherals:
- 1 USB3.0 and 3 USB2.0 subsystems
- 2 x SATA
- 2 x PCI Express Gen2
- 3-port Gigabit ethernet switch
- 2 x CAN
- MCAN
More information can be found here[1].
Adding CPU detection support for the dra76 ES1.0 soc
and update prcm, control module, dplls data.
[1] TBD
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
dra76 family is a high-performance, infotainment application
device, based on OMAP architecture on a 28-nm technology.
This contains most of the subsystems, peripherals that are
available on dra74, dra72 family. This SoC mainly features
Subsystems:
- 2 x Cortex-A15 with max speed of 1.8GHz
- 2 X DSP
- 2 X Cortex-M4 IPU
- ISS
- CAL
- DSS
- VPE
- VIP
Connectivity peripherals:
- 1 USB3.0 and 3 USB2.0 subsystems
- 2 x SATA
- 2 x PCI Express Gen2
- 3-port Gigabit ethernet switch
- 2 x CAN
- MCAN
More information can be found here[1].
Adding CPU detection support for the dra76 ES1.0 soc
and update prcm, control module, dplls data.
[1] TBD
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
configs: dra7xx: Enable LP87565 related configs
Enable LP87565 related configs
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Enable LP87565 related configs
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
power: regulator: palmas: Add smps12 dual regulator for tps65917
commit 75bceb22b3ed6882daa5933c3eb353364c7a7c83 upstream
Add smps12 dual regulator for tps65917
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 75bceb22b3ed6882daa5933c3eb353364c7a7c83 upstream
Add smps12 dual regulator for tps65917
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
power: regulator: lp87565: add regulator support
commit 2dd9dc02a3fa1f8c244482e180415d19a5ead929 upstream
The driver provides regulator set/get voltage
enable/disable functions for lp87565 family of PMICs.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 2dd9dc02a3fa1f8c244482e180415d19a5ead929 upstream
The driver provides regulator set/get voltage
enable/disable functions for lp87565 family of PMICs.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
power: pmic: lp87565: Add the basic pmic support
commit cdad57a7c1ab7c226f3997245229445b628a5f2a upstream
Add support to bind the regulators/child nodes with the pmic.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit cdad57a7c1ab7c226f3997245229445b628a5f2a upstream
Add support to bind the regulators/child nodes with the pmic.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
palmas: Add support for powering different ldos
It is not necessary that ldo1 is used to power on mmc.
So, add support for passing ldo registers for powering on mmc.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
It is not necessary that ldo1 is used to power on mmc.
So, add support for passing ldo registers for powering on mmc.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
arm: omap5+: Add board specific ldo powering
It is not necessary all omap5+ based uses the same PMIC
to poweron mmc. So add support for enabling mmc based on board.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
It is not necessary all omap5+ based uses the same PMIC
to poweron mmc. So add support for enabling mmc based on board.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
spi: ti_qspi: Fix baudrate divider calculation
commit 948b8bbd5fc4 ("spi: ti_qspi: Fix baudrate divider calculation") branch ti-u-boot-2017.01
Fix the divider calculation logic to choose a value so that the
resulting baudrate is either equal to or closest possible baudrate less
than the requested value. While at that, cleanup ti_spi_set_speed().
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 948b8bbd5fc4 ("spi: ti_qspi: Fix baudrate divider calculation") branch ti-u-boot-2017.01
Fix the divider calculation logic to choose a value so that the
resulting baudrate is either equal to or closest possible baudrate less
than the requested value. While at that, cleanup ti_spi_set_speed().
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
Manual Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
Signed-off-by: David Huang <d-huang@ti.com>
Conflicts:
include/configs/am57xx_evm.h
include/configs/dra7xx_evm.h
Manual Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
Signed-off-by: David Huang <d-huang@ti.com>
Conflicts:
include/configs/am57xx_evm.h
include/configs/dra7xx_evm.h
Revert "fastboot: flash: add buffer overflow check for cmd"
This change prevents fastboot from flashing u-boot.img
to SPI with normal fastboot flash process.
This reverts commit 3c7d22946028ca84019268f884d112dd89116ce1.
This change prevents fastboot from flashing u-boot.img
to SPI with normal fastboot flash process.
This reverts commit 3c7d22946028ca84019268f884d112dd89116ce1.
Revert "fastboot: erase QSPI boot areas only when necessary"
This change prevents fastboot from flashing u-boot.img
to SPI with normal fastboot flash process.
This reverts commit 3100c1e4fc33d463cba2d0943bf1da43e3dcfce2.
This change prevents fastboot from flashing u-boot.img
to SPI with normal fastboot flash process.
This reverts commit 3100c1e4fc33d463cba2d0943bf1da43e3dcfce2.
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
arm: am57xx: Define Android partition table
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
arm: am57xx: Define Android partition table
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
commit 6f3f23b50912 ("dra7xx_evm/am57xx_evm: update the default GPT table for eMMC") branch ti-u-boot-2017.01
The layout of the eMMC has been updated in commit 33348a383808
("ARM: ti: Update layout for MMC and eMMC (env and dfu)"). This patch
updates the GPT table for android to match this new layout for the
following items:
- xloader,
- u-boot
- the u-boot environment variables
- the DTB (aka os args, aka environment)
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 6f3f23b50912 ("dra7xx_evm/am57xx_evm: update the default GPT table for eMMC") branch ti-u-boot-2017.01
The layout of the eMMC has been updated in commit 33348a383808
("ARM: ti: Update layout for MMC and eMMC (env and dfu)"). This patch
updates the GPT table for android to match this new layout for the
following items:
- xloader,
- u-boot
- the u-boot environment variables
- the DTB (aka os args, aka environment)
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
arm: am57xx: Define Android partition table
commit a42cfa4f82ef ("arm: am57xx: Define Android partition table") branch ti-u-boot-2017.01
"fastboot oem format" command reuses "gpt write" command, which in turn
requires correct partitions defined in $partitions variable. This patch
adds such definition of Android partitions for DRA7XX EVM board.
By default $partitions variable contains Linux partition table. In order
to prepare Android environment one can run next commands from U-Boot
shell:
=> env set partitions $partitions_android
=> env save
After those operations one can go to fastboot mode and perform
"fastboot oem format" to create Android partition table.
While at it, enable CONFIG_RANDOM_UUID to spare user from providing
UUIDs for each partition manually.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit a42cfa4f82ef ("arm: am57xx: Define Android partition table") branch ti-u-boot-2017.01
"fastboot oem format" command reuses "gpt write" command, which in turn
requires correct partitions defined in $partitions variable. This patch
adds such definition of Android partitions for DRA7XX EVM board.
By default $partitions variable contains Linux partition table. In order
to prepare Android environment one can run next commands from U-Boot
shell:
=> env set partitions $partitions_android
=> env save
After those operations one can go to fastboot mode and perform
"fastboot oem format" to create Android partition table.
While at it, enable CONFIG_RANDOM_UUID to spare user from providing
UUIDs for each partition manually.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
fastboot: erase QSPI boot areas only when necessary
When switching to QSPI in fastboot using "fastboot oem spi" command, the
default was to erase the MLO and u-boot.img regions. This requires us to
flash the binaries each time we use "fastboot oem spi" irrespective of
whether we want to flash the binaries.
1. Instead use "update" command to flash the binaries. This command erases
QSPI sectors only if necessary.
2. Remove the code to always erase QSPI in fastboot.
Change-Id: I59cac981373d23a9a1fcda28e0a0d96802b78197
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
When switching to QSPI in fastboot using "fastboot oem spi" command, the
default was to erase the MLO and u-boot.img regions. This requires us to
flash the binaries each time we use "fastboot oem spi" irrespective of
whether we want to flash the binaries.
1. Instead use "update" command to flash the binaries. This command erases
QSPI sectors only if necessary.
2. Remove the code to always erase QSPI in fastboot.
Change-Id: I59cac981373d23a9a1fcda28e0a0d96802b78197
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
fastboot: flash: add buffer overflow check for cmd
As the sf flash commands are generated using sprintf, there is
possibilty of buffer overflow between commands. To avoid this issue, we
define a macro for the length of the command buffer and use snprintf to
prevent buffer overflow.
Change-Id: I2ea0a9113067238cdca9d2015c6e8b11602b1b01
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
As the sf flash commands are generated using sprintf, there is
possibilty of buffer overflow between commands. To avoid this issue, we
define a macro for the length of the command buffer and use snprintf to
prevent buffer overflow.
Change-Id: I2ea0a9113067238cdca9d2015c6e8b11602b1b01
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
Auto Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571
arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.
drivers: omap_hsmmc: Add debug information about the selected timing
drivers: omap_hsmmc: If DM_MMC is not used, get the iodelays and the pinmux from the platform code
mmc: omap_hsmmc: support for HS200 and DDR52 modes without DM_MMC
mmc: omap_hsmmc: re-arrange code layout.
mmc: omap_hsmmc: Configure PBIAS only for MMC1
mmc: omap_hsmmc: Enable ADMA support even if DM_MMC is not used
omap: Update the base address of the MMC controllers
drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization
Signed-off-by: David Huang <d-huang@ti.com>
Auto Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571
arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.
drivers: omap_hsmmc: Add debug information about the selected timing
drivers: omap_hsmmc: If DM_MMC is not used, get the iodelays and the pinmux from the platform code
mmc: omap_hsmmc: support for HS200 and DDR52 modes without DM_MMC
mmc: omap_hsmmc: re-arrange code layout.
mmc: omap_hsmmc: Configure PBIAS only for MMC1
mmc: omap_hsmmc: Enable ADMA support even if DM_MMC is not used
omap: Update the base address of the MMC controllers
drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization
Signed-off-by: David Huang <d-huang@ti.com>
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571
arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.
drivers: omap_hsmmc: Add debug information about the selected timing
drivers: omap_hsmmc: If DM_MMC is not used, get the iodelays and the pinmux from the platform code
mmc: omap_hsmmc: support for HS200 and DDR52 modes without DM_MMC
mmc: omap_hsmmc: re-arrange code layout.
mmc: omap_hsmmc: Configure PBIAS only for MMC1
mmc: omap_hsmmc: Enable ADMA support even if DM_MMC is not used
omap: Update the base address of the MMC controllers
drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571
arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.
drivers: omap_hsmmc: Add debug information about the selected timing
drivers: omap_hsmmc: If DM_MMC is not used, get the iodelays and the pinmux from the platform code
mmc: omap_hsmmc: support for HS200 and DDR52 modes without DM_MMC
mmc: omap_hsmmc: re-arrange code layout.
mmc: omap_hsmmc: Configure PBIAS only for MMC1
mmc: omap_hsmmc: Enable ADMA support even if DM_MMC is not used
omap: Update the base address of the MMC controllers
drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571
commit e70996a45ef2 ("arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit e70996a45ef2 ("arm: omap: enable high speed mode support in SPL for the eMMC on AM572 and AM571") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.
commit a8a6b928d03f ("arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit a8a6b928d03f ("arm: omap: enable high speed mode support in SPL for the eMMC on DRA7x and DRA72.") branch ti-u-boot-2017.01
Supporting DDR52 and HS200 modes requires that the pinmux and iodelays are
properly programmed with platform specific values. This commit provides the
same information as the dts does but in a manner that's usable by the SPL.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
drivers: omap_hsmmc: Add debug information about the selected timing
commit 63d2902ff6da ("drivers: omap_hsmmc: Add debug information about the selected timing") branch ti-u-boot-2017.01
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 63d2902ff6da ("drivers: omap_hsmmc: Add debug information about the selected timing") branch ti-u-boot-2017.01
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
drivers: omap_hsmmc: If DM_MMC is not used, get the iodelays and the pinmux from the platform code
based on commit e762451dbcc2 ("drivers: omap_hsmmc: In SPL get the iodelays
and the pinmux from the platform code") branch ti-u-boot-2017.01
The iodelays and pinmux information is platform specific. Since the SPL
can embed only one dts, getting this information from it would mean to have
one SPL binary for each platform.
In order to keep the ability to run the same SPL binary on several
platforms, the iodelays and pinmux configurations used by the SPL are
provided by the platform code.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
based on commit e762451dbcc2 ("drivers: omap_hsmmc: In SPL get the iodelays
and the pinmux from the platform code") branch ti-u-boot-2017.01
The iodelays and pinmux information is platform specific. Since the SPL
can embed only one dts, getting this information from it would mean to have
one SPL binary for each platform.
In order to keep the ability to run the same SPL binary on several
platforms, the iodelays and pinmux configurations used by the SPL are
provided by the platform code.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: support for HS200 and DDR52 modes without DM_MMC
In order to support HS200 and DDR52 modes in the SPL, we need to make them
available even when DM_MMC is not used.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
In order to support HS200 and DDR52 modes in the SPL, we need to make them
available even when DM_MMC is not used.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: re-arrange code layout.
This a a preparatory work before introducing support for high speed modes
without DM_MMC. There is no functional change. Some functions are moved
out of a big "#ifdef CONFIG_DM_MMC" block and before omap_mmc_init().
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
This a a preparatory work before introducing support for high speed modes
without DM_MMC. There is no functional change. Some functions are moved
out of a big "#ifdef CONFIG_DM_MMC" block and before omap_mmc_init().
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: Configure PBIAS only for MMC1
PBIAS only applies to MMC1.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
PBIAS only applies to MMC1.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: Enable ADMA support even if DM_MMC is not used
This allows to use ADMA in the SPL and when building with no DT support.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
This allows to use ADMA in the SPL and when building with no DT support.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
omap: Update the base address of the MMC controllers
Align the base address defined in header files with the base address used
in the DTS. This will facilitate the introduction of the DMA support.
Of all HSMMC users, only omap3 doesn't have the 0x100 reserved region at
the top. This region will be used to determine if the controller supports
DMA transfers
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Align the base address defined in header files with the base address used
in the DTS. This will facilitate the introduction of the DMA support.
Of all HSMMC users, only omap3 doesn't have the 0x100 reserved region at
the top. This region will be used to determine if the controller supports
DMA transfers
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization
commit e14ac74b66e3 ("drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization") branch ti-u-boot-2017.01
If the initialization fails when trying to use HS200 or DDR52, then remove
the failing capability for the capabilities supported by the host and
restart the whole initialization process.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit e14ac74b66e3 ("drivers: mmc: fall back to lower performance modes if HS200 or DDR52 fail during the initialization") branch ti-u-boot-2017.01
If the initialization fails when trying to use HS200 or DDR52, then remove
the failing capability for the capabilities supported by the host and
restart the whole initialization process.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/maint-ti-u-boot into p-ti-u-boot-2016.05
Manual Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.git.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05_07-06-17_temporary' of git://git.ti.com/ti-u-boot/ti-u-boot:
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
ti_armv7_common.h: Fix U-Boot location on eMMC
ARM: OMAP5+: Remove unsed dpll structures
ARM: ti: Update layout for MMC and eMMC (env and dfu)
ARM: ti: consolidate dfu environment variables
mmc: omap_hsmmc: fix indexing of padconf and iodelay
dts: dra7: Add pinctrl-cells property to pinmux core
mmc: omap_hsmmc: use fdt api to get pinctrl entry size
lib: fdt: add an api to read pinctrl entry size
boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot
spl: fdt: support for fdt fixup for falcon boot
board: dra71: Fix selection of OPPs
mmc: omap_hsmmc: configure the regulators even when not using DM MMC
mmc: omap_hsmmc: indicates which mmc controller failed to get the chosen pinctrl
env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
env_mmc: Allow SPL to use any MMC device to load/save the environment
common: env_sf: Use CONFIG_SF_DEFAULT_xxx as the default value for CONFIG_ENV_SPI_xxx
Signed-off-by: David Huang <d-huang@ti.com>
Manual Merge of:
TI-Feature: 2016.05
TI-Tree: git://git.git.com/ti-u-boot/ti-u-boot.git
TI-Branch: ti-u-boot-2016.05
* 'ti-u-boot-2016.05_07-06-17_temporary' of git://git.ti.com/ti-u-boot/ti-u-boot:
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
ti_armv7_common.h: Fix U-Boot location on eMMC
ARM: OMAP5+: Remove unsed dpll structures
ARM: ti: Update layout for MMC and eMMC (env and dfu)
ARM: ti: consolidate dfu environment variables
mmc: omap_hsmmc: fix indexing of padconf and iodelay
dts: dra7: Add pinctrl-cells property to pinmux core
mmc: omap_hsmmc: use fdt api to get pinctrl entry size
lib: fdt: add an api to read pinctrl entry size
boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot
spl: fdt: support for fdt fixup for falcon boot
board: dra71: Fix selection of OPPs
mmc: omap_hsmmc: configure the regulators even when not using DM MMC
mmc: omap_hsmmc: indicates which mmc controller failed to get the chosen pinctrl
env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
env_mmc: Allow SPL to use any MMC device to load/save the environment
common: env_sf: Use CONFIG_SF_DEFAULT_xxx as the default value for CONFIG_ENV_SPI_xxx
Signed-off-by: David Huang <d-huang@ti.com>
dra7xx_evm/am57xx_evm: update the default GPT table for eMMC
The layout of the eMMC has been updated in commit 28d231055303
("ti_armv7_common.h: Fix U-Boot location on eMMC").
This patch update the GPT table so that xloader (MLO), u-boot and the
environment are in the right locations.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
The layout of the eMMC has been updated in commit 28d231055303
("ti_armv7_common.h: Fix U-Boot location on eMMC").
This patch update the GPT table so that xloader (MLO), u-boot and the
environment are in the right locations.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ti_armv7_common.h: Fix U-Boot location on eMMC
The layout of the eMMC has been updated in commit 28d231055303
("ti_armv7_common.h: Fix U-Boot location on eMMC").
This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that
it points to correct address of "bootloader" partition and SPL is able to
read, parse and run u-boot.img correctly.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
The layout of the eMMC has been updated in commit 28d231055303
("ti_armv7_common.h: Fix U-Boot location on eMMC").
This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that
it points to correct address of "bootloader" partition and SPL is able to
read, parse and run u-boot.img correctly.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Merge branch 'ti-u-boot-2016.05' into p-ti-u-boot-2016.05
Conflicts:
arch/arm/cpu/armv7/omap-common/boot-common.c
common/env_mmc.c
common/spl/spl.c
include/configs/dra7xx_evm.h
Conflicts:
arch/arm/cpu/armv7/omap-common/boot-common.c
common/env_mmc.c
common/spl/spl.c
include/configs/dra7xx_evm.h
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
ARM: OMAP5+: Remove unsed dpll structures
ARM: ti: Update layout for MMC and eMMC (env and dfu)
ARM: ti: consolidate dfu environment variables
mmc: omap_hsmmc: fix indexing of padconf and iodelay
dts: dra7: Add pinctrl-cells property to pinmux core
mmc: omap_hsmmc: use fdt api to get pinctrl entry size
lib: fdt: add an api to read pinctrl entry size
boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot
spl: fdt: support for fdt fixup for falcon boot
board: dra71: Fix selection of OPPs
mmc: omap_hsmmc: configure the regulators even when not using DM MMC
mmc: omap_hsmmc: indicates which mmc controller failed to get the chosen pinctrl
env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
env_mmc: Allow SPL to use any MMC device to load/save the environment
common: env_sf: Use CONFIG_SF_DEFAULT_xxx as the default value for CONFIG_ENV_SPI_xxx
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
ARM: OMAP5+: Remove unsed dpll structures
ARM: ti: Update layout for MMC and eMMC (env and dfu)
ARM: ti: consolidate dfu environment variables
mmc: omap_hsmmc: fix indexing of padconf and iodelay
dts: dra7: Add pinctrl-cells property to pinmux core
mmc: omap_hsmmc: use fdt api to get pinctrl entry size
lib: fdt: add an api to read pinctrl entry size
boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot
spl: fdt: support for fdt fixup for falcon boot
board: dra71: Fix selection of OPPs
mmc: omap_hsmmc: configure the regulators even when not using DM MMC
mmc: omap_hsmmc: indicates which mmc controller failed to get the chosen pinctrl
env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
env_mmc: Allow SPL to use any MMC device to load/save the environment
common: env_sf: Use CONFIG_SF_DEFAULT_xxx as the default value for CONFIG_ENV_SPI_xxx
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
ARM: OMAP5+: Remove unsed dpll structures
commit 16b5a886b5a174b3d17e70e499fa04abf141eee9 branch ti-u-boot-2017.01
Latest gcc compile strted complaining about defined structure definition
that are not used. Remove the unused sturctures.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 16b5a886b5a174b3d17e70e499fa04abf141eee9 branch ti-u-boot-2017.01
Latest gcc compile strted complaining about defined structure definition
that are not used. Remove the unused sturctures.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ARM: ti: Update layout for MMC and eMMC (env and dfu)
commit 7a53a1a8115beb53b47a758c1a6e527420d8a43e upstream
The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region
"spl-os-image.raw".
both: region "spl-os-image.raw" is quite small and can't handle android
kernels
Fixing this requires growing some regions and moving others.
Care has been taken to leave some room for further growth of
"spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the
region is not free space that can be used to grow "u-boot.img.raw".
The MLO region is 0x100 sectors wide but the 0x100 are unused in case the
MLO comes too overflow this areas.
The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
commit 7a53a1a8115beb53b47a758c1a6e527420d8a43e upstream
The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region
"spl-os-image.raw".
both: region "spl-os-image.raw" is quite small and can't handle android
kernels
Fixing this requires growing some regions and moving others.
Care has been taken to leave some room for further growth of
"spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the
region is not free space that can be used to grow "u-boot.img.raw".
The MLO region is 0x100 sectors wide but the 0x100 are unused in case the
MLO comes too overflow this areas.
The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
ARM: ti: consolidate dfu environment variables
commit f843770a6aef83bb981becf10a5a3f93b9bf599b branch ti-u-boot-2017.01
Introduce include/environment/ti/dfu.h that
consolidates environment variable definitions
for various TI boards that support DFU today.
Tested on AM335x EVM, AM437x SK EVM and DRA74x
EVM by using DFU to write to SD card.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit f843770a6aef83bb981becf10a5a3f93b9bf599b branch ti-u-boot-2017.01
Introduce include/environment/ti/dfu.h that
consolidates environment variable definitions
for various TI boards that support DFU today.
Tested on AM335x EVM, AM437x SK EVM and DRA74x
EVM by using DFU to write to SD card.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: fix indexing of padconf and iodelay
Fixes: c791e6c2d574 ("drivers: mmc: omap_hsmmc: Add support to set IODELAY values")
Indexing of padconf entries and iodelay entries
was wrong, corrected it.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Fixes: c791e6c2d574 ("drivers: mmc: omap_hsmmc: Add support to set IODELAY values")
Indexing of padconf entries and iodelay entries
was wrong, corrected it.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
dts: dra7: Add pinctrl-cells property to pinmux core
Pinctrl-cells property tells the number of values in each pinctrl
entry in addition to the index. This can be used by drivers to
appropriately allocate an array to hold the entries.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Pinctrl-cells property tells the number of values in each pinctrl
entry in addition to the index. This can be used by drivers to
appropriately allocate an array to hold the entries.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: use fdt api to get pinctrl entry size
Use fdt_pinctrl_cells() api to get the pinctrl entry size from
device tree instead of hard coding it in the driver.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Use fdt_pinctrl_cells() api to get the pinctrl entry size from
device tree instead of hard coding it in the driver.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
lib: fdt: add an api to read pinctrl entry size
Drivers that configure pinmux at runtime need to parse device tree
entries and store them in an array.Provide an api to get the size
of each entry, size here means the number of individual values in
the entry, so that driver can appropriately allocate memory to store
the entries.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Drivers that configure pinmux at runtime need to parse device tree
entries and store them in an array.Provide an api to get the size
of each entry, size here means the number of individual values in
the entry, so that driver can appropriately allocate memory to store
the entries.
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot
commit 6e7585bb64b12 upstream
In single stage bootmode or falcon boot mode, the SPL shall update the
device tree that we load with the normal fixups done via
arch_fixup_fdt(), when possible (ie we have enough information in this
restricted environment to be able to do that still). This will include
for example updating them memory nodes.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
[trini: Reword commit message]
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 6e7585bb64b12 upstream
In single stage bootmode or falcon boot mode, the SPL shall update the
device tree that we load with the normal fixups done via
arch_fixup_fdt(), when possible (ie we have enough information in this
restricted environment to be able to do that still). This will include
for example updating them memory nodes.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
[trini: Reword commit message]
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
spl: fdt: support for fdt fixup for falcon boot
commit 984a3c877707 upstream
Adding support for fdt fixup to update the
memory node in device tree for falcon boot.
This is needed for single stage or falcon
bootmode, to pass memory configuration to
kernel through DT memory node.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 984a3c877707 upstream
Adding support for fdt fixup to update the
memory node in device tree for falcon boot.
This is needed for single stage or falcon
bootmode, to pass memory configuration to
kernel through DT memory node.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: dra71: Fix selection of OPPs
commit 6cc96bc upstream
As per the DM[1] Dated June 2016–Revised February 2017, Table 5-3,
DRA71 supports the following OPPs for various voltage domains:
VDD_MPU: OPP_NOM
VDD_CORE: OPP_NOM
VDD_GPU: OPP_NOM
VDD_DSPEVE: OPP_NOM, OPP_HIGH
VDD_IVA: OPP_NOM, OPP_HIGH
This patch add support for selection of the above OPPs instead of
using OPP_NOM for all voltage domains.
[1] http://www.ti.com/lit/ds/symlink/dra718.pdf
Reported-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 6cc96bc upstream
As per the DM[1] Dated June 2016–Revised February 2017, Table 5-3,
DRA71 supports the following OPPs for various voltage domains:
VDD_MPU: OPP_NOM
VDD_CORE: OPP_NOM
VDD_GPU: OPP_NOM
VDD_DSPEVE: OPP_NOM, OPP_HIGH
VDD_IVA: OPP_NOM, OPP_HIGH
This patch add support for selection of the above OPPs instead of
using OPP_NOM for all voltage domains.
[1] http://www.ti.com/lit/ds/symlink/dra718.pdf
Reported-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
fs: fat: use debug() for buffer misalignment warnings
Signed-off-by: David Huang <d-huang@ti.com>
* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
fs: fat: use debug() for buffer misalignment warnings
Signed-off-by: David Huang <d-huang@ti.com>
defconfigs: dra7xx_hs_evm: Move OPTEE load address to avoid overlaps
Move the OPTEE load address to 0xbdb00000 in order to avoid
overlap with the memory regions used in radio and RVC usecases.
Change-Id: Ia941a0a65a748353bd05a65914ae6e3e7ffe23a1
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Move the OPTEE load address to 0xbdb00000 in order to avoid
overlap with the memory regions used in radio and RVC usecases.
Change-Id: Ia941a0a65a748353bd05a65914ae6e3e7ffe23a1
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
DRA7XX - Late Attach - Use reserved memory for IOUMM table
IOMMU Table memory for remote cores is carved out. With page table
allocation from end of CMA-POOL from u-boot, kernel treats this region
as free memory. This causes an MMU faults on remote cores in low memory
situations.
IOMMU table region 0xbfc00000 - 0xbfd00000 has to carved out with
reserved_mem in kernel.
Kernel commit details: 41a8818d9675804bd3054395ca893c99bfce88be
http://review.omapzoom.org/#/c/38093/
Change-Id: I09ec250f3a8ec4a934ad73437981c5dea8930a34
Signed-off-by: Subash Lakkimsetti <x0091084@ti.com>
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
IOMMU Table memory for remote cores is carved out. With page table
allocation from end of CMA-POOL from u-boot, kernel treats this region
as free memory. This causes an MMU faults on remote cores in low memory
situations.
IOMMU table region 0xbfc00000 - 0xbfd00000 has to carved out with
reserved_mem in kernel.
Kernel commit details: 41a8818d9675804bd3054395ca893c99bfce88be
http://review.omapzoom.org/#/c/38093/
Change-Id: I09ec250f3a8ec4a934ad73437981c5dea8930a34
Signed-off-by: Subash Lakkimsetti <x0091084@ti.com>
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
mmc: omap_hsmmc: configure the regulators even when not using DM MMC
commit 3e0e1a652d19d6246e67685951241b497296b971 branch ti-u-boot-2017.01
We need to manage the regulators for proper MMC operations even when DM_MMC
and/or DM_REGULATOR are not used.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 3e0e1a652d19d6246e67685951241b497296b971 branch ti-u-boot-2017.01
We need to manage the regulators for proper MMC operations even when DM_MMC
and/or DM_REGULATOR are not used.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
mmc: omap_hsmmc: indicates which mmc controller failed to get the chosen pinctrl
commit 2a7e353079720145650d47b1775dae5c740d08ef branch ti-u-boot-2017.01
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 2a7e353079720145650d47b1775dae5c740d08ef branch ti-u-boot-2017.01
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it
commit 9e1e356c715ae9c011b301d47d85821f2a1840f4 branch ti-u-boot-2017.01
When booting from a non-MMC device, the MMC sub-system may not be
initialized when the environment is first accessed.
We need to make sure that the MMC sub-system is ready in even a non-MMC
boot case. env_init() seems like a logical place for this.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 9e1e356c715ae9c011b301d47d85821f2a1840f4 branch ti-u-boot-2017.01
When booting from a non-MMC device, the MMC sub-system may not be
initialized when the environment is first accessed.
We need to make sure that the MMC sub-system is ready in even a non-MMC
boot case. env_init() seems like a logical place for this.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
commit 3eb68c53ebd8aee9ed2b9b58761856a366c2764f branch ti-u-boot-2017.01
To keep a consistent MMC device mapping in SPL and in u-boot, let's
register the MMC controllers the same way in u-boot and in the SPL.
In terms of boot time, it doesn't hurt to register more controllers than
needed because the MMC device is initialized only prior being accessed for
the first time.
Having the same device mapping in SPL and u-boot allows us to use the
environment in SPL whatever the MMC boot device.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 3eb68c53ebd8aee9ed2b9b58761856a366c2764f branch ti-u-boot-2017.01
To keep a consistent MMC device mapping in SPL and in u-boot, let's
register the MMC controllers the same way in u-boot and in the SPL.
In terms of boot time, it doesn't hurt to register more controllers than
needed because the MMC device is initialized only prior being accessed for
the first time.
Having the same device mapping in SPL and u-boot allows us to use the
environment in SPL whatever the MMC boot device.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
env_mmc: Allow SPL to use any MMC device to load/save the environment
commit 62ded97d65ef6ad98f89cb23125997fcf2434b65 branch ti-u-boot-2017.01
SPL has been restricted to use only dev 0 based on the assumption that only
one MMC device is registered. This is not always the case and many
platforms now register several devices as expected by the spl mmc boot code
For those platform SPL_ENV_SUPPORT is broken if dev is forced to 0.
A word of warning: this commit may break SPL_ENV_SUPPORT on platforms that
do not register the same MMC controllers in SPL and in u-boot (mostly iMX6
based platforms). Fortunately none of those activate SPL_ENV_SUPPORT in
their default configuration.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 62ded97d65ef6ad98f89cb23125997fcf2434b65 branch ti-u-boot-2017.01
SPL has been restricted to use only dev 0 based on the assumption that only
one MMC device is registered. This is not always the case and many
platforms now register several devices as expected by the spl mmc boot code
For those platform SPL_ENV_SUPPORT is broken if dev is forced to 0.
A word of warning: this commit may break SPL_ENV_SUPPORT on platforms that
do not register the same MMC controllers in SPL and in u-boot (mostly iMX6
based platforms). Fortunately none of those activate SPL_ENV_SUPPORT in
their default configuration.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
board: ti: dra71: Add JAMR board pinmux
All values copied from the DRA72x PCT tool and iodelay tool
Add pinmux for i2c4 and mcASP on JAMR board
Change-Id: Iaddd31bd3055648c62dd360bd9b8c597c232f461
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
All values copied from the DRA72x PCT tool and iodelay tool
Add pinmux for i2c4 and mcASP on JAMR board
Change-Id: Iaddd31bd3055648c62dd360bd9b8c597c232f461
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
common: env_sf: Use CONFIG_SF_DEFAULT_xxx as the default value for CONFIG_ENV_SPI_xxx
The default values for the configuration defines CONFIG_ENV_SPI_xxx are
arbitrary values. It makes more sense to set them to the values used by
the sf command.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
The default values for the configuration defines CONFIG_ENV_SPI_xxx are
arbitrary values. It makes more sense to set them to the values used by
the sf command.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
fs: fat: use debug() for buffer misalignment warnings
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: maint-uboot-2016
TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git
TI-Branch: maint-ti-u-boot-2016.05
* 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot:
fs: fat: use debug() for buffer misalignment warnings
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
fs: fat: use debug() for buffer misalignment warnings
commit 62605654f2cda82c1f1f1c1045726edde746d782 branch ti-u-boot-2017.01
functions to get/set the data from/to the block device require buffers
aligned on the cache lines. When the buffers are not aligned, a bounce
buffer is used and a warning message is output. This has been introduced
in commits cc63b25e and 8133f43d1.
As this is only a warning, let's move to using debug().
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
commit 62605654f2cda82c1f1f1c1045726edde746d782 branch ti-u-boot-2017.01
functions to get/set the data from/to the block device require buffers
aligned on the cache lines. When the buffers are not aligned, a bounce
buffer is used and a warning message is output. This has been introduced
in commits cc63b25e and 8133f43d1.
As this is only a warning, let's move to using debug().
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
spl: sqpi: boot: Fix u-boot loading when SPL_OS_BOOT is not set
It's assumed that SPL should load the u-boot image when the
CONFIG_SPL_OS_BOOT option is not set.
The spl_spi_load_image() function uses the same variable to
check the returned value of function calls as well as to
determine if the u-boot image is to be loaded. This variable
was initialized to 0, which isn't right because 0 means that
the u-boot image is not going to be loaded.
This problem caused HS boot to be broken. GP boot was not
affected because CONFIG_SPL_OS_BOOT is defined non HS devices.
Change-Id: I00c3790c31618a8ab25cbb4f3cc848b5166f274a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
It's assumed that SPL should load the u-boot image when the
CONFIG_SPL_OS_BOOT option is not set.
The spl_spi_load_image() function uses the same variable to
check the returned value of function calls as well as to
determine if the u-boot image is to be loaded. This variable
was initialized to 0, which isn't right because 0 means that
the u-boot image is not going to be loaded.
This problem caused HS boot to be broken. GP boot was not
affected because CONFIG_SPL_OS_BOOT is defined non HS devices.
Change-Id: I00c3790c31618a8ab25cbb4f3cc848b5166f274a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
am57xx: config: enable USB mass storage
Enable USB mass storage option in u-boot via 'ums'
command.
Change-Id: Idda4cbe6fa58ec7aa3dd0149d1a2faa270730004
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Enable USB mass storage option in u-boot via 'ums'
command.
Change-Id: Idda4cbe6fa58ec7aa3dd0149d1a2faa270730004
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
dra7: config: enable USB mass storage
Enable USB mass storage option in u-boot via 'ums'
command.
Change-Id: Id3da2a88750446860270552766e055c17846cb2b
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Enable USB mass storage option in u-boot via 'ums'
command.
Change-Id: Id3da2a88750446860270552766e055c17846cb2b
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
boot: fdt: fixup the memory dt nodes falcon boot
In single stage bootmode or falcon boot mode,
the SPL shall update the memory dt nodes based
on DDR configuration for specific platform.
This patch fixes kernel crash observed during
single stage qspi boot mode.
Change-Id: Ie7b52c9cf1f8dc2deb006be10ab8a18c53a88db7
Signed-off-by: Ravi Babu <ravibabu@ti.com>
In single stage bootmode or falcon boot mode,
the SPL shall update the memory dt nodes based
on DDR configuration for specific platform.
This patch fixes kernel crash observed during
single stage qspi boot mode.
Change-Id: Ie7b52c9cf1f8dc2deb006be10ab8a18c53a88db7
Signed-off-by: Ravi Babu <ravibabu@ti.com>