Kyungmin Park [Tue, 29 Dec 2009 09:55:08 +0000 (18:55 +0900)]
s5pc110: aquila: Use proper EVT names
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Joonyoung Shim [Tue, 29 Dec 2009 08:55:19 +0000 (17:55 +0900)]
build: Modify user setting
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Minkyu Kang [Tue, 29 Dec 2009 08:48:51 +0000 (17:48 +0900)]
s5pc110: enable i2c clocks
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Tue, 29 Dec 2009 08:39:58 +0000 (17:39 +0900)]
s5pc110: aquila: rev0.7 is 4G2G1G
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Tue, 29 Dec 2009 08:14:12 +0000 (17:14 +0900)]
s5pc110: aquila: add memory setting for rev0.8
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
daeinki [Tue, 29 Dec 2009 05:39:47 +0000 (14:39 +0900)]
s5pc110: fb: added evt1 FIMD Driver support.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 10:46:43 +0000 (19:46 +0900)]
build: modify prom's setting
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 08:59:54 +0000 (17:59 +0900)]
s5pc110: enable PWM clock
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 08:34:36 +0000 (17:34 +0900)]
Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
Minkyu Kang [Mon, 28 Dec 2009 08:33:57 +0000 (17:33 +0900)]
s5pc110: checksum: evt1 doesn't have reserved page
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Joonyoung Shim [Mon, 28 Dec 2009 08:23:12 +0000 (17:23 +0900)]
s5pc110: geminus: Add rev0.1 board detection
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 07:35:33 +0000 (16:35 +0900)]
s5pc110: checksum: fix checksum routine
evt1 needs to sum reserved page, but evt0 doesn't need it.
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 07:11:50 +0000 (16:11 +0900)]
s5pc110: evt1: fix text base
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 28 Dec 2009 07:08:30 +0000 (16:08 +0900)]
s5pc110: checksum: fix checksum routine
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Kyungmin Park [Sat, 26 Dec 2009 04:41:37 +0000 (13:41 +0900)]
s5pc110: aquila: Fix wrong TEXT_BASE16K_*
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Sat, 26 Dec 2009 04:26:21 +0000 (13:26 +0900)]
s5pc110: aquila: set correct relocation address
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Sat, 26 Dec 2009 04:22:20 +0000 (13:22 +0900)]
s5pc110: aquila: Fix wrong size
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 08:30:46 +0000 (17:30 +0900)]
s5pc110: support evt1
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 05:18:46 +0000 (14:18 +0900)]
s5pc110: aquila: disable ldo3
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 05:10:25 +0000 (14:10 +0900)]
s5pc110: pmic: add pmic command config
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 04:34:33 +0000 (13:34 +0900)]
s5pc110: aquila: seperate the 3-touchkey checking logic
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 02:22:53 +0000 (11:22 +0900)]
s5pc110: aquila: codes clean
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 00:41:37 +0000 (09:41 +0900)]
s5pc110: gpio: codes clean
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 24 Dec 2009 00:23:42 +0000 (09:23 +0900)]
s5pc110: gpio: fix print msg
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Wed, 23 Dec 2009 09:49:07 +0000 (18:49 +0900)]
s5pc110: gpio: add gpio command config
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Wed, 23 Dec 2009 09:44:33 +0000 (18:44 +0900)]
s5pc110: gpio: add gpio command for debugging
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Wed, 23 Dec 2009 05:56:37 +0000 (14:56 +0900)]
s5pc110: aquila: battery: reset correctly
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
MyungJoo Ham [Wed, 23 Dec 2009 01:48:31 +0000 (10:48 +0900)]
s5pc110: PULL-UP setting for GPG1_[1,4-5] (WLAN_SDIO CMD, D)
Kyungmin Park [Tue, 22 Dec 2009 12:09:44 +0000 (21:09 +0900)]
Revert "s5pc110: clock: enabled sgx core clock."
This reverts commit
cfef27e7e90af51ecbdc94f2271610a6beda9c0c.
daeinki [Tue, 22 Dec 2009 08:13:28 +0000 (17:13 +0900)]
s5pc110: clock: enabled sgx core clock.
this clock should be disabled in the future.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Tue, 22 Dec 2009 02:39:19 +0000 (11:39 +0900)]
s5pc110: aquila: disable SROMC clock
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Tue, 22 Dec 2009 01:48:38 +0000 (10:48 +0900)]
build: add private setting
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 21 Dec 2009 08:37:56 +0000 (17:37 +0900)]
s5pc110: aquila: add IP4 clock gating
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Mon, 21 Dec 2009 03:28:15 +0000 (12:28 +0900)]
s5pc110: aquila: remove power gating (for suspend/resume)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
daeinki [Fri, 18 Dec 2009 08:55:34 +0000 (17:55 +0900)]
s5pc110: corrected board detection.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 08:25:34 +0000 (17:25 +0900)]
s5pc110: bug fix for board detection.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 08:08:59 +0000 (17:08 +0900)]
s5pc110: added dual lcd support for Media and modified board detection.
1. added dual rgb code to framebuffer driver.
2. modified board detection.
3. code clean.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Fri, 18 Dec 2009 07:13:29 +0000 (16:13 +0900)]
s5pc1xx: aquila: remove warning
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
daeinki [Fri, 18 Dec 2009 07:03:09 +0000 (16:03 +0900)]
s5pc110: fb: added definitions for dual rgb.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 06:58:39 +0000 (15:58 +0900)]
s5pc110: added board detection code for Media.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 06:52:35 +0000 (15:52 +0900)]
s5pc110: added machine detection for Media.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 02:56:41 +0000 (11:56 +0900)]
s5pc110: fb: code clean.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Fri, 18 Dec 2009 02:43:08 +0000 (11:43 +0900)]
s5pc110: added Cypress lcd support and updated lcd driver.
1. Cypress lcd panel on.
2. changed panel parameter names to more generic.
3. updated s6e63m0 lcd driver.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Fri, 18 Dec 2009 01:41:59 +0000 (10:41 +0900)]
s5pc110: aquila: set i2c bus when charge mode
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
daeinki [Thu, 17 Dec 2009 12:36:23 +0000 (21:36 +0900)]
s5pc110: lcd: added gpio setting for Cypress.
Signed-off-by: daeinki <inki.dae@samsung.com>
Kyungmin Park [Thu, 17 Dec 2009 12:20:19 +0000 (21:20 +0900)]
s5pc110: defer the meminfo setup
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Thu, 17 Dec 2009 11:56:28 +0000 (20:56 +0900)]
s5pc110: aquila: env code cleanup
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Thu, 17 Dec 2009 11:34:14 +0000 (20:34 +0900)]
Merge branch 'master' of kmpark@party:/pub/git/u-boot-s5pc1xx
Kyungmin Park [Thu, 17 Dec 2009 11:34:10 +0000 (20:34 +0900)]
Revert "s5pc110: Aquila: Fix mtdparts parsing problem"
This reverts commit
3506471e1c1cb6953222a520f2d1480c3fa5bd15.
Minkyu Kang [Thu, 17 Dec 2009 11:23:14 +0000 (20:23 +0900)]
s5pc110: aquila: support clock & power gating
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Kyungmin Park [Thu, 17 Dec 2009 11:21:48 +0000 (20:21 +0900)]
s5pc110: Aquila: Fix mtdparts parsing problem
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Thu, 17 Dec 2009 10:57:13 +0000 (19:57 +0900)]
s5pc110: Pass DMC1 CS1 memory configuration (not yet finished)
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
daeinki [Thu, 17 Dec 2009 09:54:32 +0000 (18:54 +0900)]
s5pc110: fb: bug fix.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Thu, 17 Dec 2009 08:08:14 +0000 (17:08 +0900)]
s5pc110: cypress: add support i2c gpio 7
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
daeinki [Thu, 17 Dec 2009 08:06:01 +0000 (17:06 +0900)]
s5pc110: fb: code clean.
Signed-off-by: daeinki <inki.dae@samsung.com>
daeinki [Thu, 17 Dec 2009 07:45:23 +0000 (16:45 +0900)]
s5pc110: fb: updated framebuffer driver.
1. changed framebuffer driver framework.
2. set default layer to 3.
3. added Geminus lcd panel support.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Thu, 17 Dec 2009 06:18:41 +0000 (15:18 +0900)]
s5pc110: cypress: support i2c gpio6 for cypress
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
MyungJoo Ham [Thu, 17 Dec 2009 04:38:51 +0000 (13:38 +0900)]
Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx
MyungJoo Ham [Thu, 17 Dec 2009 04:38:28 +0000 (13:38 +0900)]
s5pc110: Do NOT turn off LDO6.
Minkyu Kang [Thu, 17 Dec 2009 02:20:20 +0000 (11:20 +0900)]
s5pc110: fsa9480: need some time after resume? (workaround)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 17 Dec 2009 02:19:26 +0000 (11:19 +0900)]
s5pc110: geminus: use the fuel-gauge
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Thu, 17 Dec 2009 00:04:36 +0000 (09:04 +0900)]
s5pc110: aquila: revision6 doesn't support MHL chip
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Kyungmin Park [Wed, 16 Dec 2009 12:41:31 +0000 (21:41 +0900)]
s5pc110: aquila: Fix Rev0.6 memory detection
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Wed, 16 Dec 2009 12:30:45 +0000 (21:30 +0900)]
s5pc110: aquila: Don't use DMC1 CS1 memory at Rev0.5
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Wed, 16 Dec 2009 10:50:24 +0000 (19:50 +0900)]
s5pc110: Fix DMC1 CS1 memory configuration
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Wed, 16 Dec 2009 10:49:51 +0000 (19:49 +0900)]
s5pc110: aquila: Fix Rev 0.4 detection
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Wed, 16 Dec 2009 09:00:02 +0000 (18:00 +0900)]
s5pc110: 4G3G1G support (not yet verified)
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
MyungJoo Ham [Wed, 16 Dec 2009 08:49:55 +0000 (17:49 +0900)]
universal: max8998: do not turn VICHG off for sleep
Kyungmin Park [Tue, 15 Dec 2009 09:19:16 +0000 (18:19 +0900)]
s5pc110: Prepare memory configuration for 3G/4G
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Minkyu Kang [Tue, 15 Dec 2009 08:03:22 +0000 (17:03 +0900)]
s5pc110: fsa9480: clear interrupt when charge mode
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Kyungmin Park [Tue, 15 Dec 2009 07:34:21 +0000 (16:34 +0900)]
s5pc110: aqulia: Rev 0.6 correct DRAM configuration
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Tue, 15 Dec 2009 05:37:22 +0000 (14:37 +0900)]
Merge branch 'master' of kmpark@party:/pub/git/u-boot-s5pc1xx
Kyungmin Park [Tue, 15 Dec 2009 05:37:18 +0000 (14:37 +0900)]
s5pc110: workaround: Aquila Rev0.6 detection
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Joonyoung Shim [Tue, 15 Dec 2009 05:10:31 +0000 (14:10 +0900)]
s5pc110: cypress: Fix board detection
This fixes P1P2 is detected to Cypress.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Kyungmin Park [Tue, 15 Dec 2009 05:00:18 +0000 (14:00 +0900)]
s5pc110: aquila: Remove Rev0.4 pseudo dection code
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Tue, 15 Dec 2009 00:52:36 +0000 (09:52 +0900)]
s5pc110: code cleanup
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Mon, 14 Dec 2009 09:54:27 +0000 (18:54 +0900)]
Merge branch 'master' of git://git.denx.de/u-boot
daeinki [Mon, 14 Dec 2009 07:22:22 +0000 (16:22 +0900)]
s5pc110: fb: bug fix.
Signed-off-by: daeinki <inki.dae@samsung.com>
Donghwa Lee [Mon, 14 Dec 2009 05:26:55 +0000 (14:26 +0900)]
s5pc1xx: cypress: Modify cypress board detection
MyungJoo Ham [Fri, 11 Dec 2009 01:39:23 +0000 (10:39 +0900)]
Revert "s5pc110: Memory Init: LSI update applied."
This reverts commit
703cfecc81aa2239645007c8312d62f6c4c8e320.
MyungJoo Ham [Fri, 11 Dec 2009 01:18:05 +0000 (10:18 +0900)]
s5pc110: Memory Init: LSI update applied.
Joonyoung Shim [Thu, 10 Dec 2009 12:12:09 +0000 (21:12 +0900)]
s5pc110: cypress: Add cypress board detection
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Donghwa Lee [Thu, 10 Dec 2009 04:59:45 +0000 (13:59 +0900)]
s5pc110: lcd: Correct gamma value to 260 cd
Donghwa Lee [Thu, 10 Dec 2009 04:51:56 +0000 (13:51 +0900)]
s5pc110: lcd: Change default gamma value
Peter Korsgaard [Tue, 8 Dec 2009 21:20:34 +0000 (22:20 +0100)]
mpc83xx: boot time regression, move LCRR setup back to cpu_init_f
Commit
c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR,
and LCRR bitfields) moved the LCRR assignment to after relocation
to RAM because of the potential problem with changing the local bus
clock while executing from flash.
This change unfortunately adversely affects the boot time, as running
all code up to cpu_init_r can cause significant slowdown.
E.G. on a 8347 board a bootup time increase of ~600ms has been observed:
0.020 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.168 RS: 232
0.172 I2C: ready
0.176 DRAM: 64 MB
1.236 FLASH: 32 MB
Versus:
0.016 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.092 RS: 232
0.092 I2C: ready
0.096 DRAM: 64 MB
0.644 FLASH: 32 MB
So far no boards have needed the late LCRR setup, so simply revert it
for now - If it is needed at a later time, those boards can either do
their own final LCRR setup in board code (E.G. in board_early_init_r),
or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do
the setup in cpu_init_r.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
daeinki [Wed, 9 Dec 2009 06:15:49 +0000 (15:15 +0900)]
s5pc110: fs: code refactoring and code clean.
Signed-off-by: daeinki <inki.dae@samsung.com>
Minkyu Kang [Wed, 9 Dec 2009 04:29:30 +0000 (13:29 +0900)]
s5pc110: usbd: code clean
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Wed, 9 Dec 2009 04:28:55 +0000 (13:28 +0900)]
s5pc110: sleep: use sleep 1
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Donghwa Lee [Wed, 9 Dec 2009 02:32:41 +0000 (11:32 +0900)]
s5pc1xx: p2: Code clean and bug fix
Donghwa Lee [Wed, 9 Dec 2009 01:52:05 +0000 (10:52 +0900)]
s5pc1xx: p2: Remove unused defines
Donghwa Lee [Wed, 9 Dec 2009 01:46:48 +0000 (10:46 +0900)]
s5pc1xx: p2: Set KEY_RIGHT for auto_download purpose
daeinki [Tue, 8 Dec 2009 12:24:59 +0000 (21:24 +0900)]
s5pc110: fs: read ext2 filesystem from onenand device directly instead of DRAM.
also added file read command.
this code should be cleaned and needs code refactoring.
Signed-off-by: daeinki <inki.dae@samsung.com>
Michal Simek [Tue, 8 Dec 2009 08:12:49 +0000 (09:12 +0100)]
microblaze: Correct ffs regression for Microblaze
We are using generic implementation of ffs. This should
be part of Simon's commit
0413cfecea350000eab5e591a0965c3e3ee0ff00
Here is warning message which this patch removes.
In file included from /tmp/u-boot-microblaze/include/common.h:38,
from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/linux/bitops.h:123:1: warning: "ffs" redefined
In file included from /tmp/u-boot-microblaze/include/linux/bitops.h:110,
from /tmp/u-boot-microblaze/include/common.h:38,
from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/asm/bitops.h:269:1:
warning: this is the location of the previous definition
Signed-off-by: Michal Simek <monstr@monstr.eu>
Graeme Smecher [Mon, 7 Dec 2009 16:09:57 +0000 (08:09 -0800)]
microblaze: Stop stack clobbering in microblaze-generic.
A typo caused the stack and malloc regions to overlap, which prevented
mem_malloc_init() from returning. This commit makes the memory layout match
the example described in include/configs/microblaze-generic.h
Signed-off-by: Graeme Smecher <graeme.smecher@mail.mcgill.ca>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Minkyu Kang [Tue, 8 Dec 2009 01:28:02 +0000 (10:28 +0900)]
s5pc110: lcd: kill warnings
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Tue, 8 Dec 2009 01:26:23 +0000 (10:26 +0900)]
s5pc110: sleep: kill warnings
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Minkyu Kang [Tue, 8 Dec 2009 01:15:26 +0000 (10:15 +0900)]
s5pc110: sleep: move the show_hw_revision function
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Wolfgang Denk [Mon, 7 Dec 2009 22:14:13 +0000 (23:14 +0100)]
Update CHANGELOG, prepare -rc2
Signed-off-by: Wolfgang Denk <wd@denx.de>
Peter Tyser [Mon, 7 Dec 2009 05:58:28 +0000 (23:58 -0600)]
MAKEALL: Fix return value
Previously MAKEALL would always return a value of 0, even if 1 or more
boards did not compile. This change causes MAKEALL to return 0 if all
boards were able to build, otherwise 1.
This change also requires changing the script interpreter from sh to
bash to support bash's PIPESTATUS variable.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Peter Tyser [Sun, 6 Dec 2009 07:33:24 +0000 (01:33 -0600)]
tools/mkimage: Remove duplicate line of code
Recent commits
1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and
6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the
same manner. Unfortunately git was "smart" enough to merge both changes
which resulted in some duplicate code.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reordered code and comment a bit.
Signed-off-by: Wolfgang Denk <wd@denx.de>
projects / kernel / u-boot.git / log