Patrick Georgi [Wed, 14 Apr 2010 20:47:45 +0000 (20:47 +0000)]
Quote test -f argument, so it doesn't fail on spaces.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5437
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Wed, 14 Apr 2010 20:42:42 +0000 (20:42 +0000)]
Update mingw source versions and allow parallel builds in buildgcc
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5436
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 18:59:42 +0000 (18:59 +0000)]
zero warning days. Move RAMTOP and RAMBASE together.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5435
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 17:18:34 +0000 (17:18 +0000)]
fix a case where the fam10 code would overwrite parts of a struct.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5434
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 17:11:47 +0000 (17:11 +0000)]
drop setup_ics code that was blatantly copied from cx700 and
was mainboard specific and unused there already.
some more minor warning fixes.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5433
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Wed, 14 Apr 2010 16:50:16 +0000 (16:50 +0000)]
Remove few more warnings and some dead code.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5432
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 16:39:30 +0000 (16:39 +0000)]
geeesh! And this really compiles and even runs?
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5431
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 15:45:02 +0000 (15:45 +0000)]
HWHoleSz must be u32...
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5430
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 15:44:21 +0000 (15:44 +0000)]
udelay_tsc does not exist in the whole tree.
Neither does quadcore.h (anymore)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5429
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Wed, 14 Apr 2010 14:41:30 +0000 (14:41 +0000)]
sconfig should return success when it's successful
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5428
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Wed, 14 Apr 2010 14:35:40 +0000 (14:35 +0000)]
Rename variable to not confuse gcc on mingw
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5427
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 11:40:34 +0000 (11:40 +0000)]
drop quite a lot of dead code that did nothing but produce warnings and make
the rest of the code unreadable.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5426
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 10:12:23 +0000 (10:12 +0000)]
zero warnings days. Down to under 600 different warnings
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5425
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 09:04:31 +0000 (09:04 +0000)]
fix digitallogic adl855pc compilation (and clean up the warnings while at it)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5424
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 14 Apr 2010 07:47:07 +0000 (07:47 +0000)]
move cpu/x86/car to cpu/intel/car as previously discussed on the mailing list.
this patch also slightly changes it so we have a single cache_as_ram.inc which
requires no "help" from cache_as_ram_post.c and cache_as_ram_disable.c (or
worse, a lot of cruft hacked right into romstage.c like on tyan s2735)
Now all CAR code except the AMD Opteron/Athlon64 CAR code follows the new
simpler scheme. I'll gladly leave src/cpu/amd/car to someone else ;-)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5423
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 21:31:42 +0000 (21:31 +0000)]
ip1000: fix seabios start, fix flash gpio detection
simplify i82830 code.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5422
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 21:29:43 +0000 (21:29 +0000)]
fix a trivial warning when yabel with direct hw access is enabled.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5421
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 13:48:20 +0000 (13:48 +0000)]
fix timer choice in Kconfig. HAVE_INIT_TIMER is selected correctly, no need to
mention it explicitly.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5420
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 13:43:35 +0000 (13:43 +0000)]
clean up LD scripts and add some comments and proper license headers
where applicable.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5419
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 10:04:35 +0000 (10:04 +0000)]
use the standard udelay on sc520.
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5418
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 10:01:14 +0000 (10:01 +0000)]
Speed up coreboot_ram loading by moving the decompression stack
into the cached area. Back to 469ms until coreboot_ram is actually
running on epia-cn
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5417
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Marc Bertens [Tue, 13 Apr 2010 01:22:20 +0000 (01:22 +0000)]
Add support for the SMSC
FDC37C932 Super I/O.
This chip is found e.g. in the Nokia IP330 (firewall hardware).
Signed-off-by: Marc Bertens <mbertens@xs4all.nl>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5416
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 00:11:59 +0000 (00:11 +0000)]
update atom car code in the same way that 6ex/6fx was updated.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5415
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 13 Apr 2010 00:02:20 +0000 (00:02 +0000)]
Fix eagleheights
not a 6ex board, but using the same CAR code.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5414
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Mon, 12 Apr 2010 23:12:15 +0000 (23:12 +0000)]
port latest model 6ex car changes to 6fx car, which is almost identical and
currently unused. Just keep it in sync, we might need it some day.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5413
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Mon, 12 Apr 2010 23:04:29 +0000 (23:04 +0000)]
move model_6ex car to a single file. No more .c files that only consist of a
single several pages long asm statement
Could use some renumbering of post codes, but that's good for another time.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5412
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Mon, 12 Apr 2010 15:28:34 +0000 (15:28 +0000)]
Move the CPU specific includes from
src/arch/i386/Makefile.inc to the respective CPU directories.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5411
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Mon, 12 Apr 2010 10:22:20 +0000 (10:22 +0000)]
Enable lazy evaluation of incs/lds for tiny bootblock, too.
Necessary for romstraps
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5410
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Mon, 12 Apr 2010 09:50:53 +0000 (09:50 +0000)]
- move the XIP_ROM_* flags to src/cpu/x86/Kconfig exclusively
- set them to span the last 64k, instead of the last 128k
by default
- fixes via CAR for tiny bootblock
- enabled tiny bootblock for via/vt8454c
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5409
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sun, 11 Apr 2010 20:04:50 +0000 (20:04 +0000)]
add int15 handler for thomson ip1000
fix mbi length detection, this will remove what looked like an endless loop
during vga init in some cases.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5408
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sun, 11 Apr 2010 20:02:47 +0000 (20:02 +0000)]
do better error reporting in i82801dx early smbus functions.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5407
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sun, 11 Apr 2010 19:02:10 +0000 (19:02 +0000)]
The ADL855PC was never confirmed working (in fact it's pretty sure that code
does not work as it is, but it's the only compile test case for i855pm). It's
the only board left using an ICH4 that does not use CAR. Change that.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5406
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sun, 11 Apr 2010 18:57:10 +0000 (18:57 +0000)]
add support for reading ip1000 gpios.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5405
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sun, 11 Apr 2010 18:54:47 +0000 (18:54 +0000)]
simplify ram_read32 on i82830
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5404
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Joseph Smith [Sun, 11 Apr 2010 16:36:13 +0000 (16:36 +0000)]
More trivial changes to i82830 raminit.c for USE_PRINTK_IN_CAR.
Signed-off-by: Joseph Smith <joe@settoplinux.org>
Acked-by: Joseph Smith <joe@settoplinux.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5403
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Joseph Smith [Sun, 11 Apr 2010 05:50:08 +0000 (05:50 +0000)]
Trivial changes to i82830 raminit.c for USE_PRINTK_IN_CAR.
Signed-off-by: Joseph Smith <joe@settoplinux.org>
Acked-by: Joseph Smith <joe@settoplinux.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5402
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Fri, 9 Apr 2010 22:25:27 +0000 (22:25 +0000)]
We don't define LB_CKS_* per board anymore:
build_opt_tbl figures them out for us.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5401
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 21:05:36 +0000 (21:05 +0000)]
Drop ASM_CONSOLE_LOGLEVEL from LX car code. We do output in C in copy_and_run /
later.
Call copy_and_run instead of cbfs_and_run_core because we can choose the
coreboot_ram filename in C instead of Assembler.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5400
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 20:36:29 +0000 (20:36 +0000)]
This patch changes C7 CAR code to be a single assembler file instead
of the ugly mixture it was before. It also enables CAR for all C7 boards
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5399
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 15:39:21 +0000 (15:39 +0000)]
zero warning days.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5398
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 15:29:13 +0000 (15:29 +0000)]
fix the broken nvidia chipset boards,
remove more warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5397
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 14:46:51 +0000 (14:46 +0000)]
zero warnings days.
The tyan s2895 is down to 3 warnings, 2 of which are caused by #warning.
The 1000 ways of how the AMD code waits for the cores to be started up
are a real pain for the brain.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5396
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 13:49:48 +0000 (13:49 +0000)]
drop now unussed cpu_reset.inc
make it more clear if coreboot is building without payload.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5395
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 13:35:03 +0000 (13:35 +0000)]
zero warnings days.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5394
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 13:33:59 +0000 (13:33 +0000)]
Drop the need for cpu_reset, it's really just a short cut to stage2.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5393
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 13:31:07 +0000 (13:31 +0000)]
drop unused files
drop some non-car code from amd/dualcore (there is no AMD dualcore without CAR)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5392
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 11:55:43 +0000 (11:55 +0000)]
remove some amd mainboard warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5391
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 11:37:58 +0000 (11:37 +0000)]
drop unused files, and we only use ASM_LOG_LEVEL in one file now
(LX CAR)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5390
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 11:34:59 +0000 (11:34 +0000)]
zero warning days.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5389
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Joseph Smith [Fri, 9 Apr 2010 11:10:25 +0000 (11:10 +0000)]
1. This patch adds CAR for Intel P6 series processors.
2. Add support for Micro-FCBGA 479 Celeron and PIII's
3. Add support for model_6bx and microcode updates
4. Add support for CAR and Tinybootblock on RCA RM4100 and Thomson
IP1000
Build and boot tested.
Signed-off-by: Joseph Smith <joe@settoplinux.org>
The change to CAR reveiled a few more warnings in the ICH4 and i830 code,
I fixed them on the fly.
Checking this in because my last two commits broke Joseph's CAR patch. This
version fixes the issues.
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5388
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 10:43:49 +0000 (10:43 +0000)]
copy_and_run.c is not needed twice, and it is used on non-car too.
So move it to src/arch/i386/lib/cbfs_and_run.c
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5387
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 9 Apr 2010 10:12:18 +0000 (10:12 +0000)]
thin out romcc epilogue and have it call copy_and_run as
all the others do. Make sure copy_and_run is called with
the right calling convention. Fix up 2 license headers.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5386
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Fri, 9 Apr 2010 04:01:55 +0000 (04:01 +0000)]
Indent model_fxx_init and model_10xx_init.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5385
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Fri, 9 Apr 2010 03:41:23 +0000 (03:41 +0000)]
Copy acpi blobs in two parts to make sure gcc does the right thing.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5384
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 21:04:45 +0000 (21:04 +0000)]
Split crt0.S.lb into prologue and epilogue
(the latter only for romcc), rename crt0_includes.h
to crt0.S, and compile that directly.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5383
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Thu, 8 Apr 2010 15:12:18 +0000 (15:12 +0000)]
Cosmetically make init_cpus more similar for fam10 and K8.
Remove some fam10 warnings.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5382
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Thu, 8 Apr 2010 15:09:53 +0000 (15:09 +0000)]
Clean up fidvid files using indent.
Remove some special print statements.
In general, make them easier to compare.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5381
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Thu, 8 Apr 2010 15:06:44 +0000 (15:06 +0000)]
Replace dual_core and quad_core CMOS (nvram) options with multi_core. Fix some white space.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5380
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Thu, 8 Apr 2010 15:02:39 +0000 (15:02 +0000)]
Move Kconfig for HT limits to northbridge/amd/Kconfig.
Guard the code with CONFIG_EXPERT to remove warnings.
Make it only show up for fam10, since it isn't implemented for K8 yet.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5379
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Thu, 8 Apr 2010 13:16:32 +0000 (13:16 +0000)]
output cosmetics
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5378
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 12:59:41 +0000 (12:59 +0000)]
Remove #line statements in processed parser source,
to avoid clutter in revision history.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5377
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 12:47:35 +0000 (12:47 +0000)]
cpu/emulation/qemu-x86 doesn't exist anymore, as this
is folded into mainboard/emulation/qemu-x86. Adapt code.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5376
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 12:46:18 +0000 (12:46 +0000)]
sconfig: Mangle - to _ for struct names, too.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5375
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 12:00:35 +0000 (12:00 +0000)]
Remove duplicate registers in digitallogic/adl855pc's device tree
Create directories before trying to copy files into them
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5374
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Patrick Georgi [Thu, 8 Apr 2010 11:37:43 +0000 (11:37 +0000)]
Replace sconfig with a C implementation.
(smaller, faster, standard parser generator, no more python)
Provide precompiled parser, so bison and flex are optional dependencies.
Adapt Makefile and abuild (which uses some sconfig file as a
magic path) to match.
Drop python as dependency from README, and add bison and flex
as optional dependencies
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5373
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 15:40:26 +0000 (15:40 +0000)]
- copy_and_run() gets the same calling convention on AMD and on all the others.
- some vx800 Kconfig fixes
- remove warnings...
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5372
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 15:32:52 +0000 (15:32 +0000)]
no warnings day
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5371
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 15:30:11 +0000 (15:30 +0000)]
move amd K8/Fam10 "bus detection" function prototypes to a common place.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5370
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 03:41:39 +0000 (03:41 +0000)]
it's a long term, give the compiler a chance to breathe .. ;-)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5369
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 03:40:37 +0000 (03:40 +0000)]
clean up age old via epia target.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5368
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 03:11:28 +0000 (03:11 +0000)]
drop the use of function pointers from romcc code.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5367
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 02:30:57 +0000 (02:30 +0000)]
fix epia-m700 compilation, and remove more warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5366
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 02:09:54 +0000 (02:09 +0000)]
no duplicate names in cmos.layout.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5365
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 02:06:53 +0000 (02:06 +0000)]
switch some ROMCC boards back to ROMCC.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5364
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 01:44:04 +0000 (01:44 +0000)]
"no warnings day"
last round for today. still warnings - help appreciated.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5363
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 01:41:01 +0000 (01:41 +0000)]
oops... this is a critical issue. Some boards in the tree don't compile with
romcc even though they don't have CAR either. We need to check all boards and
fix those that are broken like this.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5362
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 7 Apr 2010 00:38:09 +0000 (00:38 +0000)]
- unify use of SB_HT_CHAIN_UNITID_OFFSET_ONLY
- cleanup reset
- some minor warning fixes.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5361
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 6 Apr 2010 23:55:17 +0000 (23:55 +0000)]
fix CK804 boards.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5360
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 6 Apr 2010 21:50:21 +0000 (21:50 +0000)]
No warnings day, next round.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5359
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauerstepan [Tue, 6 Apr 2010 21:49:31 +0000 (21:49 +0000)]
fam10 acpi fix
Signed-off-by: Stefan Reinauer<stepan@coresystems.de>
Acked-by: Marc Jones <marcj303@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5358
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Rudolf Marek [Mon, 5 Apr 2010 19:47:34 +0000 (19:47 +0000)]
Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Add Asrock 939a785gmh motherboard. The ACPI needs more cleanup, could be done when cleaning
the Mahagony board. The SidePort mode does not work because AMD hardcoded memory type in rs780_gfx.c
The UMA is enabled instead. The board boots, network and int VGA works, IDE too.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5357
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Rudolf Marek [Mon, 5 Apr 2010 19:21:18 +0000 (19:21 +0000)]
Add RS785G, looks like it works although it is RV620.
Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5356
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sat, 3 Apr 2010 15:41:27 +0000 (15:41 +0000)]
device_t wants device/device.h
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5355
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sat, 3 Apr 2010 14:19:22 +0000 (14:19 +0000)]
no need to udelay()
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5354
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sat, 3 Apr 2010 13:33:01 +0000 (13:33 +0000)]
remove more warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5353
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sat, 3 Apr 2010 12:41:41 +0000 (12:41 +0000)]
remove more warnings
rename amd64_main to stage1_main..
copy src/mainboard/via/vt8454c/debug.c to src/lib/debug.c
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5352
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Sat, 3 Apr 2010 00:03:07 +0000 (00:03 +0000)]
Add noreturn attribute to die() in romcc.
This makes life a lot easier for static analyzers such as scan-build.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5351
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 2 Apr 2010 22:31:35 +0000 (22:31 +0000)]
remove more warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5350
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 2 Apr 2010 22:13:27 +0000 (22:13 +0000)]
oops, sorry, overlapping work
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5349
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 2 Apr 2010 22:11:20 +0000 (22:11 +0000)]
remove some more warnings
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5348
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Fri, 2 Apr 2010 21:39:12 +0000 (21:39 +0000)]
Fix console prototypes for non-romcc boards.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5347
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Fri, 2 Apr 2010 20:14:21 +0000 (20:14 +0000)]
Fix includes for showallroutes.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5346
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Fri, 2 Apr 2010 16:30:25 +0000 (16:30 +0000)]
The error message is misleading, even for a SPEW, because
the slot is empty, it's NOT a bad ID (and the message is
more confusing than helpful even in SPEW)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5345
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Thu, 1 Apr 2010 09:50:32 +0000 (09:50 +0000)]
-Â get rid of ASM_CONSOLE_LOGLEVEL except in two assembler files.
- start naming all versions of post code output "post_code()"
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5344
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Myles Watson [Wed, 31 Mar 2010 14:57:55 +0000 (14:57 +0000)]
Consolidate ifdefs in src/lib/cbmem.c for readability.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5343
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 31 Mar 2010 14:47:43 +0000 (14:47 +0000)]
Drop \r\n and \n\r as both print_XXX and printk now do this internally.
Only some assembler files still have \r\n ... Can we move that part to C
completely?
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5342
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 31 Mar 2010 14:34:40 +0000 (14:34 +0000)]
This patch drops arch/i386/lib/console.c and arch/i386/lib/console_print.c and
makes include/console/console.h and console/console.c usable both in
__PRE_RAM__ and coreboot_ram stages.
While debugging this, I removed an indirection from the e7520 ram init code
(same as we did on a couple of other chipsets, removes some register pressure
from romcc)
Also, drop remainders of CONFIG_USE_INIT (except the one odd piece of dead code
in cache_as_ram.inc)
Then some ap_romstage.c fixes, at least the nvidia/l1_2pvv compiled for me with
CONFIG_AP_CODE_IN_CAR set in Kconfig which it did not before.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5341
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Wed, 31 Mar 2010 00:06:12 +0000 (00:06 +0000)]
mini part of the patch on the mailing list to fix the boards again
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5340
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 30 Mar 2010 22:21:06 +0000 (22:21 +0000)]
no USE_INIT
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5339
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
Stefan Reinauer [Tue, 30 Mar 2010 22:12:59 +0000 (22:12 +0000)]
drop USE_INIT should be USE_PRINTK_IN_CAR here.
uint32_t should be u32
DEBUG_RAM_SETUP was failing on some northbridges
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5338
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1