Gerald Van Baren [Sun, 15 Apr 2007 03:02:21 +0000 (23:02 -0400)]
Merge git://www.denx.de/git/u-boot into fdt-cmd
Gerald Van Baren [Sun, 15 Apr 2007 02:51:24 +0000 (22:51 -0400)]
Improve the bootm command for CONFIG_OF_LIBFDT
In bootm, create the "/chosen" node only if it doesn't already exist
(better matches the previous behavior).
Update for proper reserved memory map handling for initrd.
Gerald Van Baren [Sun, 15 Apr 2007 02:46:41 +0000 (22:46 -0400)]
Add some utilities to manipulate the reserved memory map.
Wolfgang Denk [Sat, 14 Apr 2007 19:16:54 +0000 (21:16 +0200)]
Update CHANGELOG
Heiko Schocher [Sat, 14 Apr 2007 03:26:48 +0000 (05:26 +0200)]
[Fix] Set the LED status register on the UC101 for the LXT971 PHY.
clear the Display after reset.
Signed-off-by: Heiko Schocher <hs@denx.de>
Wolfgang Denk [Wed, 11 Apr 2007 15:25:01 +0000 (17:25 +0200)]
Update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Wed, 11 Apr 2007 15:22:55 +0000 (17:22 +0200)]
Update for SC3 board
* Make IDE timeout configurable through ide_reset_timeout variable.
* Use Newline as "password" string
* Use just a single partition in NAND flash
Gerald Van Baren [Fri, 6 Apr 2007 18:19:43 +0000 (14:19 -0400)]
Moved fdt command support code to fdt_support.c
...in preparation for improving the bootm command's handling of fdt blobs.
Also cleaned up some coding sloppiness.
Gerald Van Baren [Fri, 6 Apr 2007 18:17:14 +0000 (14:17 -0400)]
libfdt: Make fdt_check_header() public
Changed _fdt_check_header() to fdt_check_header() and made it part of
the interface - it is a useful routine.
Also did some asthetics cleanup to the include files (headers).
Wolfgang Denk [Wed, 4 Apr 2007 00:18:56 +0000 (02:18 +0200)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Wolfgang Denk [Wed, 4 Apr 2007 00:09:30 +0000 (02:09 +0200)]
Minor coding style cleanup.
Wolfgang Denk [Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-microblaze
Wolfgang Denk [Tue, 3 Apr 2007 23:49:15 +0000 (01:49 +0200)]
Minor cleanup.
Gerald Van Baren [Sat, 31 Mar 2007 18:30:53 +0000 (14:30 -0400)]
Fix some minor whitespace violations.
Gerald Van Baren [Sat, 31 Mar 2007 16:23:51 +0000 (12:23 -0400)]
Add a flattened device tree (fdt) command (2 of 2)
Modifications to the existing code to support the new fdt command.
Gerald Van Baren [Sat, 31 Mar 2007 16:22:10 +0000 (12:22 -0400)]
Add a flattened device tree (fdt) command (1 of 2)
The fdt command uses David Gibson's libfdt library to manipulate as well
as print the flattened device tree. This patch is the new command,
the second part is the modifications to the existing code.
Gerald Van Baren [Sat, 31 Mar 2007 16:13:43 +0000 (12:13 -0400)]
libfdt: Enhanced and published fdt_next_tag()
Enhanced the formerly private function _fdt_next_tag() to allow stepping
through the tree, used to produce a human-readable dump, and made
it part of the published interface.
Also added some comments.
Gerald Van Baren [Sat, 31 Mar 2007 16:05:39 +0000 (12:05 -0400)]
libfdt: Customizations for use by u-boot.
Changes to David Gibson's original source to fit into u-boot's
environment. No functionality changes.
Gerald Van Baren [Sat, 31 Mar 2007 16:00:56 +0000 (12:00 -0400)]
libfdt: Import libfdt source (2 of 2)
This adds the applicable libfdt source files (unmodified) and a README
to explain where the source came from.
Gerald Van Baren [Sat, 31 Mar 2007 15:59:59 +0000 (11:59 -0400)]
libfdt: Import libfdt source (1 of 2)
This adds the applicable libfdt source files (unmodified) and a README
to explain where the source came from.
Stefan Roese [Sat, 31 Mar 2007 11:44:12 +0000 (13:44 +0200)]
Merge with git://www.denx.de/git/u-boot.git
Stefan Roese [Sat, 31 Mar 2007 11:16:23 +0000 (13:16 +0200)]
ppc4xx: Update Katmai bootstrap command
Now the DDR2 frequency is also 2*PLB frequency when 166MHz PLB
is selected.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 31 Mar 2007 11:15:06 +0000 (13:15 +0200)]
ppc4xx: Update 44x_spd_ddr2 code (440SP/440SPe)
Additional RAM information is now printed upon powerup, like
DDR2 frequency and CAS latency.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 31 Mar 2007 06:48:36 +0000 (08:48 +0200)]
ppc4xx: Change Yucca config file to support ECC
With the updated 44x DDR2 driver the Yucca board now supports
ECC generation and checking.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 31 Mar 2007 06:47:34 +0000 (08:47 +0200)]
ppc4xx: Fix "bootstrap" command for Katmai board
The board specific "bootstrap" command is now fixed and can
be used for the AMCC Katmai board to configure different
CPU/PLB/OPB frequencies.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 31 Mar 2007 06:46:08 +0000 (08:46 +0200)]
ppc4xx: Update 44x_spd_ddr2 code (440SP/440SPe)
Fix a bug in the auto calibration routine. This driver now runs
more reliable with the tested modules. It's also tested with
167MHz PLB frequency (667MHz DDR2 frequency) on the Katmai.
Signed-off-by: Stefan Roese <sr@denx.de>
Michal Simek [Fri, 30 Mar 2007 20:52:09 +0000 (22:52 +0200)]
[PATCH] Clean include dependence
Michal Simek [Fri, 30 Mar 2007 20:42:45 +0000 (22:42 +0200)]
[CLEAN] Remove inefficient Suzaku code
Wolfgang Denk [Thu, 29 Mar 2007 10:16:41 +0000 (12:16 +0200)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-mpc86xx
Stefan Roese [Wed, 28 Mar 2007 13:03:16 +0000 (15:03 +0200)]
Merge some AMCC make targets to keep the top-level Makefile smaller
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 28 Mar 2007 12:52:12 +0000 (14:52 +0200)]
i2c: Enable "old" i2c commands even when CONFIG_I2C_CMD_TREE is defined
The "old" i2c commands (iprobe, imd...) are now compiled in again,
even when the i2c command tree is enabled via the CONFIG_I2C_CMD_TREE
config option.
Signed-off-by: Stefan Roese <sr@denx.de>
Michal Simek [Mon, 26 Mar 2007 22:32:16 +0000 (00:32 +0200)]
PATCH: Resolve GPL license problem
Michal Simek [Sun, 25 Mar 2007 23:39:07 +0000 (01:39 +0200)]
Support for XUPV2P board
Reset support
BSP autoconfig support
Stefan Roese [Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)]
Merge with /home/stefan/git/u-boot/acadia
Stefan Roese [Sat, 24 Mar 2007 14:57:09 +0000 (15:57 +0100)]
[PATCH] Add 4xx GPIO functions
This patch adds some 4xx GPIO functions. It also moves some of the
common code and defines into a common 4xx GPIO header file.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 24 Mar 2007 14:55:58 +0000 (15:55 +0100)]
[PATCH] Small Sequoia cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Sat, 24 Mar 2007 14:45:34 +0000 (15:45 +0100)]
[PATCH] Clean up 40EZ/Acadia support
This patch cleans up all the open issue of the preliminary
Acadia support.
Signed-off-by: Stefan Roese <sr@denx.de>
Jon Loeliger [Tue, 12 Dec 2006 17:02:20 +0000 (11:02 -0600)]
Fix 8641HPCN problem with ld version 2.16
(Dot outside sections problem).
This fix is in the spirit of
807d5d7319330e336ab34a5623c5e0d73b87d540.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Haiying Wang [Thu, 7 Dec 2006 16:35:55 +0000 (10:35 -0600)]
Set Rev 2.x 86xx PIC in mixed mode.
Prevent false interrupt from hanging Linux as MSR[EE] is set
to enable interrupts by changing the PIC out of the default
pass through mode into mixed mode.
Signed-off-by: Haiying Wang <haiying.wang@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Jason Jin [Thu, 7 Dec 2006 16:32:35 +0000 (10:32 -0600)]
Add flash cmd function to 8641HPCN ramboot
Also fixes some commmand for 8641 HPCN ramboot case.
Signed-off-by: Jason Jin <jason.jin@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Ed Swarthout [Thu, 7 Dec 2006 16:34:14 +0000 (10:34 -0600)]
Add support for 8641 Rev 2 silicon.
Without this patch, I am unable to get to the prompt on rev 2 silicon.
Only set ddrioovcr for rev1.
Signed-off-by: Ed Swarthout<ed.swarthout@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Wolfgang Denk [Wed, 21 Mar 2007 23:13:12 +0000 (00:13 +0100)]
Code cleanup / re-insert previous Copyright entries.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-blackfin
Wolfgang Denk [Wed, 21 Mar 2007 22:26:15 +0000 (23:26 +0100)]
Code cleanup. Update CHANGELOG
Wolfgang Denk [Wed, 21 Mar 2007 22:11:22 +0000 (23:11 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Stefan Roese [Wed, 21 Mar 2007 13:54:29 +0000 (14:54 +0100)]
ppc4xx: Fix file mode of include/configs/acadia.h
Signed-off-by: Stefan Roese <sr@denx.de>
Markus Klotzbuecher [Wed, 21 Mar 2007 13:41:46 +0000 (14:41 +0100)]
SPC1920: fix small clock routing bug
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
Stefan Roese [Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)]
Merge with /home/stefan/git/u-boot/acadia
Stefan Roese [Wed, 21 Mar 2007 12:39:57 +0000 (13:39 +0100)]
[PATCH] Add AMCC Acadia (405EZ) eval board support
This patch adds support for the new AMCC Acadia eval board.
Please note that this Acadia/405EZ support is still in a beta stage.
Still lot's of cleanup needed but we need a preliminary release now.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 21 Mar 2007 12:38:59 +0000 (13:38 +0100)]
[PATCH] Add AMCC PPC405EZ support
This patch adds support for the new AMCC 405EZ PPC. It is in
preparation for the AMCC Acadia board support.
Please note that this Acadia/405EZ support is still in a beta stage.
Still lot's of cleanup needed but we need a preliminary release now.
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Wed, 21 Mar 2007 09:23:56 +0000 (10:23 +0100)]
Merge with /home/hs/TQ/u-boot
Heiko Schocher [Wed, 21 Mar 2007 07:45:17 +0000 (08:45 +0100)]
[PATCH] TQM8272: dont change the bits given from the HRCW
for the SIUMCR and BCR Register.
Fix the calculation for the EEprom Size
Signed-off-by: Heiko Schocher <hs@denx.de>
Aubrey Li [Tue, 20 Mar 2007 14:58:25 +0000 (22:58 +0800)]
Merge http://www.denx.de/git/u-boot
Aubrey Li [Tue, 20 Mar 2007 10:16:24 +0000 (18:16 +0800)]
[Blackfin][PATCH] Add BF561 EZKIT board support
Aubrey Li [Mon, 19 Mar 2007 15:01:15 +0000 (23:01 +0800)]
Merge http://www.denx.de/git/u-boot
Aubrey Li [Mon, 19 Mar 2007 14:55:58 +0000 (22:55 +0800)]
[Blackfin][PATCH] minor cleanup
Wolfgang Denk [Mon, 19 Mar 2007 12:10:08 +0000 (13:10 +0100)]
Remove obsoleted POST files.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Aubrey Li [Sun, 18 Mar 2007 17:26:11 +0000 (01:26 +0800)]
[PATCH] Add flash chip M29W320ET/B support
Aubrey Li [Sun, 18 Mar 2007 17:24:52 +0000 (01:24 +0800)]
[Blackfin][PATCH] Add BF537 stamp board support
Wolfgang Denk [Fri, 16 Mar 2007 21:20:36 +0000 (22:20 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Stefan Roese [Fri, 16 Mar 2007 20:11:42 +0000 (21:11 +0100)]
[PATCH] Use dynamic SDRAM TLB setup on AMCC Ebony eval board
Define CONFIG_PROG_SDRAM_TLB so that the TLB entries for the
DDR memory are dynamically programmed matching the total size
of the equipped memory (DIMM modules).
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Tue, 13 Mar 2007 12:38:05 +0000 (13:38 +0100)]
[PATCH] renamed environment variable 'addcon' to 'addcons' for PCI405
boards in terms of unification.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Wolfgang Denk [Tue, 13 Mar 2007 15:05:55 +0000 (16:05 +0100)]
Make SC3 board build with 'make O='; use 'addcons' consistently
(SC3 and Jupiter used to use 'addcon' instead).
Signed-off-by: Wolfgang Denk wd@denx.de
Wolfgang Denk [Tue, 13 Mar 2007 10:33:35 +0000 (11:33 +0100)]
Merge with /home/hs/jupiter/u-boot
Heiko Schocher [Tue, 13 Mar 2007 08:40:59 +0000 (09:40 +0100)]
[PATCH] update board config for jupiter Board:
added Hush Shell,
CONFIG_CMDLINE_EDITING,
CFG_ENV_ADDR_REDUND activated
Signed-off-by: Heiko Schocher <hs@denx.de>
Aubrey Li [Mon, 12 Mar 2007 04:11:55 +0000 (12:11 +0800)]
[Blackfin][PATCH] minor cleanup
Aubrey Li [Sun, 11 Mar 2007 17:42:06 +0000 (01:42 +0800)]
[Blackfin][PATCH] Fix BUILD_DIR option of MAKEALL building issue
Aubrey Li [Sun, 11 Mar 2007 16:25:14 +0000 (00:25 +0800)]
[Blackfin][PATCH] code cleanup
Michal Simek [Sun, 11 Mar 2007 12:48:24 +0000 (13:48 +0100)]
[Microblaze][PATCH] part 2
timer support
interrupt controller support
flash support
ethernet support
cache support
board information support
env support
booting image support
adding support for Xilinx ML401
Michal Simek [Sun, 11 Mar 2007 12:42:58 +0000 (13:42 +0100)]
[Microblaze][PATCH]
timer support
interrupt controller support
flash support
ethernet support
cache support
board information support
env support
booting image support
adding support for Xilinx ML401
Aubrey Li [Sat, 10 Mar 2007 15:49:29 +0000 (23:49 +0800)]
[Blackfin][PATCH] code cleanup
Aubrey.Li [Fri, 9 Mar 2007 05:40:56 +0000 (13:40 +0800)]
[Blackfin][PATCH-2/2] Common files changed to support bf533 platform
Aubrey.Li [Fri, 9 Mar 2007 05:38:44 +0000 (13:38 +0800)]
[Blackfin]PATCH-1/2]: Remove obsolete blackfin port and add bf533 platform support
Wolfgang Denk [Thu, 8 Mar 2007 22:06:12 +0000 (23:06 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Stefan Roese [Thu, 8 Mar 2007 22:00:08 +0000 (23:00 +0100)]
ppc4xx: Fix file mode of sequoia.c
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Thu, 8 Mar 2007 21:52:51 +0000 (22:52 +0100)]
Minor cleanup.
John Otken john@softadvances.com [Thu, 8 Mar 2007 15:39:48 +0000 (09:39 -0600)]
ppc4xx: Clear Sequoia/Rainier security engine reset bits
Signed-off-by: John Otken john@softadvances.com <john@softadvances.com>
Wolfgang Denk [Thu, 8 Mar 2007 21:42:44 +0000 (22:42 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-mpc83xx
Matthias Fuchs [Thu, 8 Mar 2007 15:26:52 +0000 (16:26 +0100)]
[PATCH] I2C: add some more SPD eeprom decoding for DDR2 modules
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Matthias Fuchs [Thu, 8 Mar 2007 15:25:47 +0000 (16:25 +0100)]
[PATCH] I2C: disable flat i2c commands when CONFIG_I2C_CMD_TREE is defined
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Matthias Fuchs [Thu, 8 Mar 2007 15:23:11 +0000 (16:23 +0100)]
[PATCH] 4xx: allow CONFIG_I2C_CMD_TREE without CONFIG_I2C_MULTI_BUS
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Matthias Fuchs [Thu, 8 Mar 2007 15:20:32 +0000 (16:20 +0100)]
[PATCH] I2C: Add missing default CFG_SPD_BUS_NUM
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Matthias Fuchs [Wed, 7 Mar 2007 14:32:01 +0000 (15:32 +0100)]
fixed ethernet phy configuration for plu405 board
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Wolfgang Denk [Thu, 8 Mar 2007 20:49:27 +0000 (21:49 +0100)]
Minor cleanup
Wolfgang Denk [Thu, 8 Mar 2007 20:45:04 +0000 (21:45 +0100)]
Merge with /home/hs/jupiter/u-boot
Wolfgang Denk [Thu, 8 Mar 2007 10:38:58 +0000 (11:38 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Stefan Roese [Thu, 8 Mar 2007 09:32:45 +0000 (10:32 +0100)]
Merge with /home/stefan/git/u-boot/yucca-ddr2
Stefan Roese [Thu, 8 Mar 2007 09:13:16 +0000 (10:13 +0100)]
[PATCH] Update AMCC Luan 440SP eval board support
The AMCC Luan now uses the common 440SP(e) DDR SPD code for DDR
inititializition. This includes DDR auto calibration and support
for different DIMM modules, instead of the fixed setup used in
the earlier version.
This patch also enables the cache in FLASH for the startup
phase of U-Boot (while running from FLASH). After relocating to
SDRAM the cache is disabled again. This will speed up the boot
process, especially the SDRAM setup, since there are some loops
for memory testing (auto calibration).
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 8 Mar 2007 09:10:18 +0000 (10:10 +0100)]
[PATCH] Update AMCC Yucca 440SPe eval board support
The AMCC Yucca now uses the common 440SP(e) DDR SPD code for DDR
inititializition. This includes DDR auto calibration and support
for different DIMM modules, instead of the fixed setup used in
the earlier version.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 8 Mar 2007 09:07:18 +0000 (10:07 +0100)]
ppc4xx: Small AMCC Katmai 440SPe update
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 8 Mar 2007 09:06:09 +0000 (10:06 +0100)]
ppc4xx: Update 440SP/440SPe DDR SPD setup code to support 440SP
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Wed, 7 Mar 2007 15:50:34 +0000 (16:50 +0100)]
Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Stefan Roese [Wed, 7 Mar 2007 15:43:00 +0000 (16:43 +0100)]
[PATCH] Use dynamic SDRAM TLB setup on AMCC Ocotea eval board
Define CONFIG_PROG_SDRAM_TLB so that the TLB entries for the
DDR memory are dynamically programmed matching the total size
of the equipped memory (DIMM modules).
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 7 Mar 2007 15:39:36 +0000 (16:39 +0100)]
[PATCH] Fix AMCC 44x SPD SDRAM init code to support 2 DIMM's
This patch fixes a problem that occurs when 2 DIMM's are
used. This problem was first spotted and fixed by Gerald Jackson
<gerald.jackson@reaonixsecurity.com> but this patch fixes the
problem in a little more clever way.
This patch also adds the nice functionality to dynamically
create the TLB entries for the SDRAM (tlb.c). So we should
never run into such problems with wrong (too short) TLB
initialization again on these platforms.
As this feature is new to the "old" 44x SPD DDR driver, it
has to be enabled via the CONFIG_PROG_SDRAM_TLB define.
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Wed, 7 Mar 2007 15:33:44 +0000 (16:33 +0100)]
UC101: fix compiler warnings
Wolfgang Denk [Wed, 7 Mar 2007 15:19:46 +0000 (16:19 +0100)]
HMI1001: fix build error, cleanup compiler warnings.
Wolfgang Denk [Tue, 6 Mar 2007 17:08:43 +0000 (18:08 +0100)]
Restructure POST directory to support of other CPUs, boards, etc.
Wolfgang Denk [Tue, 6 Mar 2007 17:01:47 +0000 (18:01 +0100)]
Fix HOSTARCH handling.
Patch by Mike Frysinger, Mar 05 2007
Stefan Roese [Tue, 6 Mar 2007 06:47:04 +0000 (07:47 +0100)]
[PATCH] Speed optimization of AMCC Sequoia/Rainier DDR2 setup
As provided by the AMCC applications team, this patch optimizes the
DDR2 setup for 166MHz bus speed. The values provided are also save
to use on a "normal" 133MHz PLB bus system. Only the refresh counter
setup has to be adjusted as done in this patch.
For this the NAND booting version had to include the "speed.c" file
from the cpu/ppc4xx directory. With this addition the NAND SPL image
will just fit into the 4kbytes of program space. gcc version 4.x as
provided with ELDK 4.x is needed to generate this optimized code.
Signed-off-by: Stefan Roese <sr@denx.de>
Kim Phillips [Wed, 28 Feb 2007 06:02:04 +0000 (00:02 -0600)]
mpc83xx: fix implicit declaration of function 'ft_get_prop' warnings
(cherry picked from
c5bf13b02284c3204a723566a9bab700e5059659 commit)