by Paul Menzel
Date: Mon, 4 Mar 2013 12:56:56 +0100
When Kconfig was introduced in SeaBIOS with
commit a4c5daf0e2545361fadcad3015e10f8b23e53926
Author: Kevin O'Connor <kevin(a)koconnor.net>
Date: Mon Jan 24 22:13:58 2011 -0500
Initial commit of Kconfig build tool.
this typo was copied from Kconfig in Linux v2.6.38-rc2. In the meantime
Linux commit »kconfig: nconf: rewrite help texts« (0b616500) [1] rewrote
the texts for `nconf.c` – which might be ported too to SeaBIOS – and the
typo was fixed there. But it is still present in `mconf.c` as of Linux
3.8.
[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=0…
---
tools/kconfig/mconf.c | 2 +-
tools/kconfig/nconf.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/kconfig/mconf.c b/tools/kconfig/mconf.c
index d433c7a..2a24c42 100644
--- a/tools/kconfig/mconf.c
+++ b/tools/kconfig/mconf.c
@@ -25,7 +25,7 @@
static const char mconf_readme[] = N_(
"Overview\n"
"--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets you select features and parameters for the build.\n"
"Features can either be built-in, modularized, or ignored. Parameters\n"
"must be entered in as decimal or hexadecimal numbers or text.\n"
"\n"
diff --git a/tools/kconfig/nconf.c b/tools/kconfig/nconf.c
index db56377..bb797c9 100644
--- a/tools/kconfig/nconf.c
+++ b/tools/kconfig/nconf.c
@@ -15,7 +15,7 @@
static const char nconf_readme[] = N_(
"Overview\n"
"--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets you select features and parameters for the build.\n"
"Features can either be built-in, modularized, or ignored. Parameters\n"
"must be entered in as decimal or hexadecimal numbers or text.\n"
"\n"
--
1.7.10.4
by Michael S. Tsirkin
This is the seabios code that adds support for loading
acpi tables from QEMU: it's working fine here and
in fact, I am able to get exactly same tables with builtin
tables and with tables coming from qemu.
Changes from v1:
- simplified linker interfaces along the lines suggested
by Kevin
- fixed lots of bugs
Michael S. Tsirkin (5):
linker: utility to patch in-memory ROM files
pmm: add a way to test whether memory is in FSEG
acpi: pack rsdp
acpi: load and link tables from /etc/acpi/
acpi: add an option to disable builtin tables
Makefile | 2 +-
src/Kconfig | 12 +++++-
src/acpi.c | 39 +++++++++++++++++
src/acpi.h | 2 +-
src/linker.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/linker.h | 72 +++++++++++++++++++++++++++++++
src/paravirt.c | 2 +
src/pmm.c | 24 ++++++++---
src/util.h | 2 +
9 files changed, 278 insertions(+), 9 deletions(-)
create mode 100644 src/linker.c
create mode 100644 src/linker.h
--
MST
by Gerd Hoffmann
Hi,
Finally found the time to polish the xhci implementation
and improve usb core support for xhci. So here we go.
cheers,
Gerd
Gerd Hoffmann (4):
uas: add (temporary) superspeed stopgap
usb: don't free usbdev
usb: add usb_update_pipe()
usb: add xhci support
Makefile | 2 +-
src/Kconfig | 6 +
src/pci_ids.h | 1 +
src/usb-uas.c | 4 +
src/usb-xhci.c | 1124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/usb-xhci.h | 144 ++++++++
src/usb.c | 37 +-
src/usb.h | 17 +-
8 files changed, 1320 insertions(+), 15 deletions(-)
create mode 100644 src/usb-xhci.c
create mode 100644 src/usb-xhci.h
--
1.8.3.1
by Chen Fan
After OS ejecting a vcpu successful, it will call CPEJ method,
there communicate the masked vcpu bitmap to QEMU.
Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com>
---
src/acpi-dsdt-cpu-hotplug.dsl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/acpi-dsdt-cpu-hotplug.dsl b/src/acpi-dsdt-cpu-hotplug.dsl
index 0f3e83b..b25963c 100644
--- a/src/acpi-dsdt-cpu-hotplug.dsl
+++ b/src/acpi-dsdt-cpu-hotplug.dsl
@@ -34,7 +34,11 @@ Scope(\_SB) {
}
Method(CPEJ, 2, NotSerialized) {
// _EJ0 method - eject callback
- Sleep(200)
+ Store(Zero, Index(CPON, ToInteger(Arg0)))
+ Store(One, Local0)
+ ShiftLeft(Local0, Arg0, Local0)
+ Not(Local0, Local0)
+ And(PRS, Local0, PRS)
}
/* CPU hotplug notify method */
--
1.8.1.4
by Jan Beulich
In the course of dealing with a problem in Xen's use of SeaBIOS when
the resulting image exceeds 128k I found it desirable to not add
unnecessarily much padding to the beginning of the image. Going in 64k
steps should be sufficient; perhaps one could use even smaller ones,
thus increasing the chances of there always being a window of available
space at C0000h.
Signed-off-by: Jan Beulich <jbeulich(a)suse.com>
--- a/tools/checkrom.py
+++ b/tools/checkrom.py
@@ -32,11 +32,14 @@ def main():
rawdata = f.read()
f.close()
datasize = len(rawdata)
- finalsize = 64*1024
- if datasize > 64*1024:
+ if datasize > 192*1024:
+ finalsize = 256*1024
+ elif datasize > 128*1024:
+ finalsize = 192*1024
+ elif datasize > 64*1024:
finalsize = 128*1024
- if datasize > 128*1024:
- finalsize = 256*1024
+ else:
+ finalsize = 64*1024
# Sanity checks
start = symbols['code32flat_start'].offset
by Gonglei (Arei)
Hi all.
I got another trouble after I using that patch, which windows 2003 32bit guest VNC display wasn't normal,
please see the attached. In addition, windows 2003 64bit guest had a normal display.
I couldn't understand it, anyone can help me? Thanks you in advance.
The patch is:
http://xen.1045712.n5.nabble.com/PATCH-QEMU-Clear-bios-framebuffer-with-min…
Best Regards,
-Gonglei
> -----Original Message-----
> Subject: Re: [Xen-devel] [Qemu-devel] Cirrus VGA slow screen update, show
> blank screen last 13s or so for windows XP guest
>
>
> On Aug 20, 2013, at 3:45 PM, Konrad Rzeszutek Wilk
> <konrad.wilk(a)oracle.com>
> wrote:
>
> > On Sat, Aug 17, 2013 at 09:04:29AM +0000, Gonglei (Arei) wrote:
> >> Hi,
> >> The fundamental reason is traditional qemu-dm and upstream qemu using a
> different vgabios-cirrus.bin,
> >> qemu-dm is using xen-4.1.2/tools/firmware/vgabios/
> VGABIOS-lgpl-latest.cirrus.bin,
> >> but upstream qemu is using qemu-1.2.2/pc-bios/vgabios-cirrus.bin
> >>
> >> the pivotal patch is :
> >>
> >> # HG changeset patch
> >> # User Keir Fraser <keir(a)xensource.com>
> >> # Date 1193391667 -3600
> >> # Node ID d31f63db5f1e88deadc5461adda07b77c22873d7
> >> # Parent 413107fa49a50e5c61ac390dc1870d8995b2a012
> >>
> >> x86, hvm: Allow Cirrus VGA BIOS to clear framebuffer with minimal PIO
> writes.
> >>
> >> Signed-off-by: Ben Guthro <bguthro(a)virtualron.com>
> >> Signed-off-by: Gary Grebus <ggrebus(a)virtualiron.com>
> >
> > Ben's new address is <benjamin.guthro(a)citrix.com>. CC-ing him here.
>
> FWIW, I took Gary's patch, and made it apply to unstable, at that time.
> He was the primary developer, in that case.
>
> That's how I recall it, anyhow...from 6 years ago.
>
> I don't have Gary's new contact info.
>
> Regards,
> Ben
>
> >
> >>
> >> diff -r 413107fa49a5 -r d31f63db5f1e tools/firmware/vgabios/clext.c
> >> --- a/tools/firmware/vgabios/clext.c Fri Oct 26 10:33:12 2007 +0100
> >> +++ b/tools/firmware/vgabios/clext.c Fri Oct 26 10:41:07 2007 +0100
> >> @@ -1489,14 +1489,26 @@
> >> mov dx, #0x3ce
> >> out dx, ax
> >> push ax
> >> - mov cx, #0xa000
> >> - mov es, cx
> >> - xor di, di
> >> +
> >> +;; Windows Vista appears to be emulating this sequence as part of
> changing
> >> +;; screen resolution, but it generates 4096 writes per iteration.
> >> +;; Instead, use a magic register sequence to write the whole bank.
> >> +;;mov cx, #0xa000
> >> +;;mov es, cx
> >> +;;xor di, di
> >> +;;mov ax, si
> >> +;;mov cx, #8192
> >> +;;cld
> >> +;;rep
> >> +;; stosw
> >> mov ax, si
> >> - mov cx, #8192
> >> - cld
> >> - rep
> >> - stosw
> >> + shl ax, #8
> >> + mov al, #0xfe
> >> + out dx, ax ;; Low byte of value to be written to the bank
> >> + mov ax, si
> >> + mov al, #0xff
> >> + out dx, ax ;; High byte and trigger the write
> >> +
> >> pop ax
> >> inc ah
> >> cmp ah, bl
> >> diff -r 413107fa49a5 -r d31f63db5f1e tools/ioemu/hw/cirrus_vga.c
> >> --- a/tools/ioemu/hw/cirrus_vga.c Fri Oct 26 10:33:12 2007 +0100
> >> +++ b/tools/ioemu/hw/cirrus_vga.c Fri Oct 26 10:41:07 2007 +0100
> >> @@ -294,6 +294,7 @@
> >>
> >> static void cirrus_bitblt_reset(CirrusVGAState *s);
> >> static void cirrus_update_memory_access(CirrusVGAState *s);
> >> +static void cirrus_vga_mem_writew(void *opaque, target_phys_addr_t
> addr, uint32_t val);
> >>
> >> /***************************************
> >> *
> >> @@ -1497,6 +1498,17 @@
> >> case 0x31: // BLT STATUS/START
> >> cirrus_write_bitblt(s, reg_value);
> >> break;
> >> +
> >> + // Extension to allow BIOS to clear 16K VRAM bank in one operation
> >> + case 0xFE:
> >> + s->gr[reg_index] = reg_value; // Lower byte of value to be written
> >> + break;
> >> + case 0xFF: {
> >> + target_phys_addr_t addr;
> >> + for (addr = 0xa0000; addr < 0xa4000; addr += 2)
> >> + cirrus_vga_mem_writew(s, addr, (reg_value << 8) | s->gr[0xFE]);
> >> + }
> >> + break;
> >> default:
> >> #ifdef DEBUG_CIRRUS
> >> printf("cirrus: outport gr_index %02x, gr_value %02x\n", reg_index,
> >>
> >> By replacing the vgabios-cirrus.bin, the windows XP guest screen updating is
> fast with upstream qemu.
> >>
> >> And I test the latest vgabios-0.7a come from
> >> http://www.nongnu.org/vgabios/#DOWNLOAD
> >> but the problem of blank screen remain.
> >>
>> Best Regards!
>> -Gonglei
>>
>>
>>> -----Original Message-----
>>> From: Gonglei (Arei)
>>> Sent: Friday, August 16, 2013 5:10 PM
>>> To: Gonglei (Arei); 'Pasi Kärkkäinen'
>>> Cc: 'Gerd Hoffmann'; 'Andreas Färber'; Hanweidong; Luonengjun;
>>> 'qemu-devel(a)nongnu.org'; 'xen-devel(a)lists.xen.org'; 'Anthony Liguori';
>>> Huangweidong (Hardware); 'Ian.Jackson(a)eu.citrix.com'; 'Anthony Liguori';
>>> Yanqiangjun; Yangxiaowei
>>> Subject: RE: [Xen-devel] [Qemu-devel] Cirrus VGA slow screen update, show
>>> blank screen last 13s or so for windows XP guest
>>>
>>> Hi, all
>>> I compared the traditional qemu-dm and upstream qemu,
>>> and I found the upstream qemu will create the expansion ROM at f3000000,
>>> but qemu-dm don't.
>>> the details as below (by "lspci -vnnn"):
>>>
>>> 1) traditional qemu-dm:
>>> 00:02.0 VGA compatible controller [0300]: Cirrus Logic GD 5446 [1013:00b8]
>>> (prog-if 00 [VGA controller])
>>> Subsystem: XenSource, Inc. Device [5853:0001]
>>> Flags: bus master, fast devsel, latency 0, IRQ 11
>>> Memory at f0000000 (32-bit, prefetchable) [size=32M]
>>> Memory at f3000000 (32-bit, non-prefetchable) [size=4K]
>>> Kernel modules: cirrusfb
>>>
>>> 2) upstream qemu:
>>> 00:02.0 VGA compatible controller [0300]: Cirrus Logic GD 5446 [1013:00b8]
>>> (prog-if 00 [VGA controller])
>>> Subsystem: XenSource, Inc. Device [5853:0001]
>>> Physical Slot: 2
>>> Flags: bus master, fast devsel, latency 0, IRQ 11
>>> Memory at f0000000 (32-bit, prefetchable) [size=32M]
>>> Memory at f3020000 (32-bit, non-prefetchable) [size=4K]
>>> Expansion ROM at f3000000 [disabled] [size=64K]
>>> Kernel modules: cirrusfb
>>>
>>> I tried to simply delete the expansion ROM at function pci_add_option_rom,
>>> such as
>>>
>>> //pci_register_bar(pdev, PCI_ROM_SLOT, 0, &pdev->rom);
>>>
>>> but the VNC viewer only can see black screen, but RDP works well.
>>> Any ideas about the cirrus's expansion ROM?
>>> Slow screen refresh has any relationship with cirrus's expansion ROM?
>>> Thank you in advance！
>>>
>>> BTW, I added some log in stdvga.c(xen-4.1.2/xen/arch/x86/hvm):
>>> static int stdvga_intercept_mmio(ioreq_t *p)
>>> {
>>> struct domain *d = current->domain;
>>> struct hvm_hw_stdvga *s = &d->arch.hvm_domain.stdvga;
>>> int buf = 0, rc;
>>> static int count_1 = 0;
>>> static int count_2 = 0;
>>>
>>> if ( p->size > 8 )
>>> {
>>> gdprintk(XENLOG_WARNING, "invalid mmio size %d\n", (int)p->size);
>>> return X86EMUL_UNHANDLEABLE;
>>> }
>>>
>>> spin_lock(&s->lock);
>>>
>>> if ( s->stdvga && s->cache )
>>> {
>>> switch ( p->type )
>>> {
>>> case IOREQ_TYPE_COPY:
>>> buf = mmio_move(s, p);
>>> count_1++;
>>> if (count_1 % 1000 == 0)
>>> gdprintk(XENLOG_WARNING, " =uvp= enter mmio_move,
>>> count_1=%d\n", count_1);
>>> if ( !buf )
>>> s->cache = 0;
>>> break;
>>> default:
>>> gdprintk(XENLOG_WARNING, "unsupported mmio request
>>> type:%d "
>>> "addr:0x%04x data:0x%04x size:%d count:%d
>>> state:%d "
>>> "isptr:%d dir:%d df:%d\n",
>>> p->type, (int)p->addr, (int)p->data, (int)p->size,
>>> (int)p->count, p->state,
>>> p->data_is_ptr, p->dir, p->df);
>>> s->cache = 0;
>>> }
>>> }
>>> else
>>> {
>>> buf = (p->dir == IOREQ_WRITE);
>>> count_2++;
>>> if (count_2 % 5000 == 0)
>>> gdprintk(XENLOG_WARNING, " >>> vga mmio count_2=%d\n",
>>> count_2);
>>> }
>>>
>>> rc = (buf && hvm_buffered_io_send(p));
>>>
>>> spin_unlock(&s->lock);
>>>
>>> return rc ? X86EMUL_OKAY : X86EMUL_UNHANDLEABLE;
>>> }
>>>
>>> and I got the below result with upstream qemu and tranditional qemu-dm:
>>>
>>> 1) traditional qemu-dm:
>>> (XEN) stdvga.c:152:d2 entering stdvga and caching modes
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=460000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=461000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=462000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=463000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=464000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=465000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=466000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=467000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=468000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=469000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=470000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=471000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=472000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=473000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=474000
>>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=475000
>>> (XEN) stdvga.c:156:d2 leaving stdvga
>>>
>>> 2) upstream qemu:
>>> (XEN) stdvga.c:152:d1 entering stdvga and caching modes
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=233000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=234000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=235000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=236000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=237000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=238000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=239000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=240000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=241000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=242000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=243000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=244000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=245000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=246000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=247000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=248000
>>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=249000
>>> (XEN) stdvga.c:156:d1 leaving stdvga
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8400000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8405000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8410000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8415000
>>> ... ... //Omit some similar
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12570000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12575000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12580000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12585000
>>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12590000
>>>
>>> Upstream qemu has lot's of MMIO access Memory region 0xa0000~0xc0000
>>> than traditional qemu-dm.
>>>
>>> Best Regards!
>>>
>>> -Gonglei
>>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel(a)lists.xen.org
>> http://lists.xen.org/xen-devel
by Kevin O'Connor
Update kconfig (from Linux v2.6.38-rc2) to the latest version (from
Linux v3.11-rc6).
This is a copy of kconfig from Linux with only the changes necessary
to work with the SeaBIOS build (the equivalent of the earlier SeaBIOS
0da7bfdf commit) and the changes necessary to always emit symbols
(SeaBIOS b623e7c5 commit).
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
scripts/kconfig/.gitignore | 3 +-
scripts/kconfig/Makefile | 178 +-
scripts/kconfig/check.sh | 2 +-
scripts/kconfig/conf.c | 116 +-
scripts/kconfig/confdata.c | 488 ++--
scripts/kconfig/expr.c | 15 +-
scripts/kconfig/expr.h | 19 +-
scripts/kconfig/gconf.c | 63 +-
scripts/kconfig/kconfig_load.c | 35 -
scripts/kconfig/kxgettext.c | 1 -
.../kconfig/{lex.zconf.c_shipped => lex.zconf.c} | 0
scripts/kconfig/list.h | 131 ++
scripts/kconfig/lkc.h | 35 +-
scripts/kconfig/lkc_proto.h | 8 +-
scripts/kconfig/lxdialog/check-lxdialog.sh | 15 +-
scripts/kconfig/lxdialog/checklist.c | 8 +-
scripts/kconfig/lxdialog/dialog.h | 31 +-
scripts/kconfig/lxdialog/inputbox.c | 129 +-
scripts/kconfig/lxdialog/menubox.c | 35 +-
scripts/kconfig/lxdialog/textbox.c | 183 +-
scripts/kconfig/lxdialog/util.c | 92 +-
scripts/kconfig/lxdialog/yesno.c | 8 +-
scripts/kconfig/mconf.c | 369 ++-
scripts/kconfig/menu.c | 137 +-
scripts/kconfig/merge_config.sh | 150 ++
scripts/kconfig/nconf.c | 446 ++--
scripts/kconfig/nconf.gui.c | 89 +-
scripts/kconfig/nconf.h | 2 +-
scripts/kconfig/qconf.cc | 21 +-
scripts/kconfig/qconf.h | 2 +-
scripts/kconfig/streamline_config.pl | 640 ++++++
scripts/kconfig/symbol.c | 165 +-
scripts/kconfig/util.c | 25 +-
scripts/kconfig/zconf.gperf | 2 +-
scripts/kconfig/zconf.hash.c_shipped | 273 ++-
scripts/kconfig/zconf.l | 50 +-
scripts/kconfig/zconf.lex.c_shipped | 2420 ++++++++++++++++++++
scripts/kconfig/zconf.tab.c_shipped | 69 +-
scripts/kconfig/zconf.y | 19 +-
39 files changed, 5304 insertions(+), 1170 deletions(-)
delete mode 100644 scripts/kconfig/kconfig_load.c
rename scripts/kconfig/{lex.zconf.c_shipped => lex.zconf.c} (100%)
create mode 100644 scripts/kconfig/list.h
create mode 100755 scripts/kconfig/merge_config.sh
create mode 100644 scripts/kconfig/streamline_config.pl
create mode 100644 scripts/kconfig/zconf.lex.c_shipped
[...]
Actual patch omitted due to size. Series is at:
https://github.com/KevinOConnor/seabios/tree/testing
-Kevin
by Kevin O'Connor
It's common for other projects (eg, QEMU, Linux) to put build scripts
into a "scripts/" directory. There's no reason for SeaBIOS to be
different, so rename the "tools/" directory to "scripts/".
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
Makefile | 38 +++++++++++-----------
{tools => scripts}/acpi_extract.py | 0
{tools => scripts}/acpi_extract_preprocess.py | 0
{tools => scripts}/buildrom.py | 0
{tools => scripts}/buildversion.sh | 0
{tools => scripts}/checkrom.py | 0
{tools => scripts}/checkstack.py | 0
{tools => scripts}/checksum.py | 0
{tools => scripts}/encodeint.py | 0
{tools => scripts}/gen-offsets.sh | 0
{tools => scripts}/kconfig/.gitignore | 0
{tools => scripts}/kconfig/Makefile | 2 +-
scripts/kconfig/POTFILES.in | 12 +++++++
{tools => scripts}/kconfig/check.sh | 0
{tools => scripts}/kconfig/conf.c | 0
{tools => scripts}/kconfig/confdata.c | 0
{tools => scripts}/kconfig/expr.c | 0
{tools => scripts}/kconfig/expr.h | 0
{tools => scripts}/kconfig/gconf.c | 2 +-
{tools => scripts}/kconfig/gconf.glade | 0
{tools => scripts}/kconfig/images.c | 0
{tools => scripts}/kconfig/kconfig_load.c | 2 +-
{tools => scripts}/kconfig/kxgettext.c | 0
{tools => scripts}/kconfig/lex.zconf.c_shipped | 0
{tools => scripts}/kconfig/lkc.h | 0
{tools => scripts}/kconfig/lkc_proto.h | 0
{tools => scripts}/kconfig/lxdialog/.gitignore | 0
.../kconfig/lxdialog/BIG.FAT.WARNING | 0
.../kconfig/lxdialog/check-lxdialog.sh | 0
{tools => scripts}/kconfig/lxdialog/checklist.c | 0
{tools => scripts}/kconfig/lxdialog/dialog.h | 0
{tools => scripts}/kconfig/lxdialog/inputbox.c | 0
{tools => scripts}/kconfig/lxdialog/menubox.c | 0
{tools => scripts}/kconfig/lxdialog/textbox.c | 0
{tools => scripts}/kconfig/lxdialog/util.c | 0
{tools => scripts}/kconfig/lxdialog/yesno.c | 0
{tools => scripts}/kconfig/mconf.c | 0
{tools => scripts}/kconfig/menu.c | 0
{tools => scripts}/kconfig/nconf.c | 0
{tools => scripts}/kconfig/nconf.gui.c | 0
{tools => scripts}/kconfig/nconf.h | 0
{tools => scripts}/kconfig/qconf.cc | 0
{tools => scripts}/kconfig/qconf.h | 0
{tools => scripts}/kconfig/symbol.c | 0
{tools => scripts}/kconfig/util.c | 0
{tools => scripts}/kconfig/zconf.gperf | 0
{tools => scripts}/kconfig/zconf.hash.c_shipped | 0
{tools => scripts}/kconfig/zconf.l | 0
{tools => scripts}/kconfig/zconf.tab.c_shipped | 0
{tools => scripts}/kconfig/zconf.y | 0
{tools => scripts}/layoutrom.py | 0
{tools => scripts}/readserial.py | 0
{tools => scripts}/test-build.sh | 0
{tools => scripts}/transdump.py | 0
{tools => scripts}/vgafixup.py | 0
tools/kconfig/POTFILES.in | 12 -------
56 files changed, 34 insertions(+), 34 deletions(-)
rename {tools => scripts}/acpi_extract.py (100%)
rename {tools => scripts}/acpi_extract_preprocess.py (100%)
rename {tools => scripts}/buildrom.py (100%)
rename {tools => scripts}/buildversion.sh (100%)
rename {tools => scripts}/checkrom.py (100%)
rename {tools => scripts}/checkstack.py (100%)
rename {tools => scripts}/checksum.py (100%)
rename {tools => scripts}/encodeint.py (100%)
rename {tools => scripts}/gen-offsets.sh (100%)
rename {tools => scripts}/kconfig/.gitignore (100%)
rename {tools => scripts}/kconfig/Makefile (99%)
create mode 100644 scripts/kconfig/POTFILES.in
rename {tools => scripts}/kconfig/check.sh (100%)
rename {tools => scripts}/kconfig/conf.c (100%)
rename {tools => scripts}/kconfig/confdata.c (100%)
rename {tools => scripts}/kconfig/expr.c (100%)
rename {tools => scripts}/kconfig/expr.h (100%)
rename {tools => scripts}/kconfig/gconf.c (99%)
rename {tools => scripts}/kconfig/gconf.glade (100%)
rename {tools => scripts}/kconfig/images.c (100%)
rename {tools => scripts}/kconfig/kconfig_load.c (89%)
rename {tools => scripts}/kconfig/kxgettext.c (100%)
rename {tools => scripts}/kconfig/lex.zconf.c_shipped (100%)
rename {tools => scripts}/kconfig/lkc.h (100%)
rename {tools => scripts}/kconfig/lkc_proto.h (100%)
rename {tools => scripts}/kconfig/lxdialog/.gitignore (100%)
rename {tools => scripts}/kconfig/lxdialog/BIG.FAT.WARNING (100%)
rename {tools => scripts}/kconfig/lxdialog/check-lxdialog.sh (100%)
rename {tools => scripts}/kconfig/lxdialog/checklist.c (100%)
rename {tools => scripts}/kconfig/lxdialog/dialog.h (100%)
rename {tools => scripts}/kconfig/lxdialog/inputbox.c (100%)
rename {tools => scripts}/kconfig/lxdialog/menubox.c (100%)
rename {tools => scripts}/kconfig/lxdialog/textbox.c (100%)
rename {tools => scripts}/kconfig/lxdialog/util.c (100%)
rename {tools => scripts}/kconfig/lxdialog/yesno.c (100%)
rename {tools => scripts}/kconfig/mconf.c (100%)
rename {tools => scripts}/kconfig/menu.c (100%)
rename {tools => scripts}/kconfig/nconf.c (100%)
rename {tools => scripts}/kconfig/nconf.gui.c (100%)
rename {tools => scripts}/kconfig/nconf.h (100%)
rename {tools => scripts}/kconfig/qconf.cc (100%)
rename {tools => scripts}/kconfig/qconf.h (100%)
rename {tools => scripts}/kconfig/symbol.c (100%)
rename {tools => scripts}/kconfig/util.c (100%)
rename {tools => scripts}/kconfig/zconf.gperf (100%)
rename {tools => scripts}/kconfig/zconf.hash.c_shipped (100%)
rename {tools => scripts}/kconfig/zconf.l (100%)
rename {tools => scripts}/kconfig/zconf.tab.c_shipped (100%)
rename {tools => scripts}/kconfig/zconf.y (100%)
rename {tools => scripts}/layoutrom.py (100%)
rename {tools => scripts}/readserial.py (100%)
rename {tools => scripts}/test-build.sh (100%)
rename {tools => scripts}/transdump.py (100%)
rename {tools => scripts}/vgafixup.py (100%)
delete mode 100644 tools/kconfig/POTFILES.in
diff --git a/Makefile b/Makefile
index 2116407..1588522 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ vpath %.S src vgasrc
################ Common build rules
# Verify the build environment works.
-TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh)
+TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" scripts/test-build.sh)
ifeq "$(TESTGCC)" "-1"
$(error "Please upgrade the build environment")
endif
@@ -127,7 +127,7 @@ $(OUT)asm-offsets.s: $(OUT)autoconf.h
$(OUT)asm-offsets.h: $(OUT)asm-offsets.s
@echo " Generating offset file $@"
- $(Q)./tools/gen-offsets.sh $< $@
+ $(Q)./scripts/gen-offsets.sh $< $@
$(OUT)ccode16.o: $(OUT)autoconf.h $(patsubst %.c, $(OUT)%.o,$(SRC16)) ; $(call whole-compile, $(CFLAGS16), $(addprefix src/, $(SRC16)),$@)
@@ -139,18 +139,18 @@ $(OUT)romlayout.o: romlayout.S $(OUT)asm-offsets.h
@echo " Compiling (16bit) $@"
$(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@
-$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o tools/layoutrom.py tools/buildversion.sh
+$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o scripts/layoutrom.py scripts/buildversion.sh
@echo " Building ld scripts"
- $(Q)./tools/buildversion.sh $(OUT)version.c
+ $(Q)./scripts/buildversion.sh $(OUT)version.c
$(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o
$(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o
$(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o
$(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump
$(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump
$(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
- $(Q)$(PYTHON) ./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
+ $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
-# These are actually built by tools/layoutrom.py above, but by pulling them
+# These are actually built by scripts/layoutrom.py above, but by pulling them
# into an extra rule we prevent make -j from spawning layoutrom.py 4 times.
$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code16.o: $(OUT)romlayout16.lds
@@ -166,11 +166,11 @@ $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT
@echo " Linking $@"
$(Q)$(LD) -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@
-$(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
+$(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o scripts/checkrom.py
@echo " Prepping $@"
$(Q)$(OBJDUMP) -thr $< > $<.objdump
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
- $(Q)$(PYTHON) ./tools/checkrom.py $<.objdump $(OUT)bios.bin.raw $(OUT)bios.bin
+ $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(OUT)bios.bin.raw $(OUT)bios.bin
$(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf
@@ -186,18 +186,18 @@ CFLAGS16VGA = $(CFLAGS16INC) -Isrc
$(OUT)vgaccode16.raw.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@)
-$(OUT)vgaccode16.o: $(OUT)vgaccode16.raw.s tools/vgafixup.py
+$(OUT)vgaccode16.o: $(OUT)vgaccode16.raw.s scripts/vgafixup.py
@echo " Fixup VGA rom assembler"
- $(Q)$(PYTHON) ./tools/vgafixup.py $< $(OUT)vgaccode16.s
+ $(Q)$(PYTHON) ./scripts/vgafixup.py $< $(OUT)vgaccode16.s
$(Q)$(AS) --32 src/code16gcc.s $(OUT)vgaccode16.s -o $@
$(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h
@echo " Compiling (16bit) $@"
$(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@
-$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds tools/buildversion.sh
+$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds scripts/buildversion.sh
@echo " Linking $@"
- $(Q)./tools/buildversion.sh $(OUT)vgaversion.c VAR16
+ $(Q)./scripts/buildversion.sh $(OUT)vgaversion.c VAR16
$(Q)$(CC) $(CFLAGS16VGA) -c $(OUT)vgaversion.c -o $(OUT)vgaversion.o
$(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@
@@ -205,9 +205,9 @@ $(OUT)vgabios.bin.raw: $(OUT)vgarom.o
@echo " Extracting binary $@"
$(Q)$(OBJCOPY) -O binary $< $@
-$(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
+$(OUT)vgabios.bin: $(OUT)vgabios.bin.raw scripts/buildrom.py
@echo " Finalizing rom $@"
- $(Q)$(PYTHON) ./tools/buildrom.py $< $@
+ $(Q)$(PYTHON) ./scripts/buildrom.py $< $@
################ DSDT build rules
@@ -215,12 +215,12 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
; then echo "$(2)"; else echo "$(3)"; fi ;)
-$(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py
+$(OUT)%.hex: src/%.dsl ./scripts/acpi_extract_preprocess.py ./scripts/acpi_extract.py
@echo " Compiling IASL $@"
$(Q)$(CPP) $(CPPFLAGS) $< -o $(OUT)$*.dsl.i.orig
- $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i
+ $(Q)$(PYTHON) ./scripts/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i
$(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i
- $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off
+ $(Q)$(PYTHON) ./scripts/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off
$(Q)cat $(OUT)$*.off > $@
$(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT)ssdt-misc.hex $(OUT)q35-acpi-dsdt.hex
@@ -228,9 +228,9 @@ $(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT
################ Kconfig rules
define do-kconfig
-$(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
+$(Q)mkdir -p $(OUT)/scripts/kconfig/lxdialog
$(Q)mkdir -p $(OUT)/include/config
-$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/tools/kconfig/Makefile srctree=$(CURDIR) src=tools/kconfig obj=tools/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
+$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/scripts/kconfig/Makefile srctree=$(CURDIR) src=scripts/kconfig obj=scripts/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
endef
$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
diff --git a/tools/acpi_extract.py b/scripts/acpi_extract.py
similarity index 100%
rename from tools/acpi_extract.py
rename to scripts/acpi_extract.py
diff --git a/tools/acpi_extract_preprocess.py b/scripts/acpi_extract_preprocess.py
similarity index 100%
rename from tools/acpi_extract_preprocess.py
rename to scripts/acpi_extract_preprocess.py
diff --git a/tools/buildrom.py b/scripts/buildrom.py
similarity index 100%
rename from tools/buildrom.py
rename to scripts/buildrom.py
diff --git a/tools/buildversion.sh b/scripts/buildversion.sh
similarity index 100%
rename from tools/buildversion.sh
rename to scripts/buildversion.sh
diff --git a/tools/checkrom.py b/scripts/checkrom.py
similarity index 100%
rename from tools/checkrom.py
rename to scripts/checkrom.py
diff --git a/tools/checkstack.py b/scripts/checkstack.py
similarity index 100%
rename from tools/checkstack.py
rename to scripts/checkstack.py
diff --git a/tools/checksum.py b/scripts/checksum.py
similarity index 100%
rename from tools/checksum.py
rename to scripts/checksum.py
diff --git a/tools/encodeint.py b/scripts/encodeint.py
similarity index 100%
rename from tools/encodeint.py
rename to scripts/encodeint.py
diff --git a/tools/gen-offsets.sh b/scripts/gen-offsets.sh
similarity index 100%
rename from tools/gen-offsets.sh
rename to scripts/gen-offsets.sh
diff --git a/tools/kconfig/.gitignore b/scripts/kconfig/.gitignore
similarity index 100%
rename from tools/kconfig/.gitignore
rename to scripts/kconfig/.gitignore
diff --git a/tools/kconfig/Makefile b/scripts/kconfig/Makefile
similarity index 99%
rename from tools/kconfig/Makefile
rename to scripts/kconfig/Makefile
index 890243b..39d62a8 100644
--- a/tools/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -81,7 +81,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
$(Q)xgettext --default-domain=linux \
--add-comments --keyword=_ --keyword=N_ \
--from-code=UTF-8 \
- --files-from=tools/kconfig/POTFILES.in \
+ --files-from=scripts/kconfig/POTFILES.in \
--output $(obj)/config.pot
$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
diff --git a/scripts/kconfig/POTFILES.in b/scripts/kconfig/POTFILES.in
new file mode 100644
index 0000000..9674573
--- /dev/null
+++ b/scripts/kconfig/POTFILES.in
@@ -0,0 +1,12 @@
+scripts/kconfig/lxdialog/checklist.c
+scripts/kconfig/lxdialog/inputbox.c
+scripts/kconfig/lxdialog/menubox.c
+scripts/kconfig/lxdialog/textbox.c
+scripts/kconfig/lxdialog/util.c
+scripts/kconfig/lxdialog/yesno.c
+scripts/kconfig/mconf.c
+scripts/kconfig/conf.c
+scripts/kconfig/confdata.c
+scripts/kconfig/gconf.c
+scripts/kconfig/gconf.glade.h
+scripts/kconfig/qconf.cc
diff --git a/tools/kconfig/check.sh b/scripts/kconfig/check.sh
similarity index 100%
rename from tools/kconfig/check.sh
rename to scripts/kconfig/check.sh
diff --git a/tools/kconfig/conf.c b/scripts/kconfig/conf.c
similarity index 100%
rename from tools/kconfig/conf.c
rename to scripts/kconfig/conf.c
diff --git a/tools/kconfig/confdata.c b/scripts/kconfig/confdata.c
similarity index 100%
rename from tools/kconfig/confdata.c
rename to scripts/kconfig/confdata.c
diff --git a/tools/kconfig/expr.c b/scripts/kconfig/expr.c
similarity index 100%
rename from tools/kconfig/expr.c
rename to scripts/kconfig/expr.c
diff --git a/tools/kconfig/expr.h b/scripts/kconfig/expr.h
similarity index 100%
rename from tools/kconfig/expr.h
rename to scripts/kconfig/expr.h
diff --git a/tools/kconfig/gconf.c b/scripts/kconfig/gconf.c
similarity index 99%
rename from tools/kconfig/gconf.c
rename to scripts/kconfig/gconf.c
index b7f31f2..4558961 100644
--- a/tools/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
/* Determine GUI path */
env = getenv(SRCTREE);
if (env)
- glade_file = g_strconcat(env, "/tools/kconfig/gconf.glade", NULL);
+ glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
else if (av[0][0] == '/')
glade_file = g_strconcat(av[0], ".glade", NULL);
else
diff --git a/tools/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
similarity index 100%
rename from tools/kconfig/gconf.glade
rename to scripts/kconfig/gconf.glade
diff --git a/tools/kconfig/images.c b/scripts/kconfig/images.c
similarity index 100%
rename from tools/kconfig/images.c
rename to scripts/kconfig/images.c
diff --git a/tools/kconfig/kconfig_load.c b/scripts/kconfig/kconfig_load.c
similarity index 89%
rename from tools/kconfig/kconfig_load.c
rename to scripts/kconfig/kconfig_load.c
index 2d0cff8..dbdcaad 100644
--- a/tools/kconfig/kconfig_load.c
+++ b/scripts/kconfig/kconfig_load.c
@@ -15,7 +15,7 @@ void kconfig_load(void)
handle = dlopen("./libkconfig.so", RTLD_LAZY);
if (!handle) {
- handle = dlopen("./tools/kconfig/libkconfig.so", RTLD_LAZY);
+ handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY);
if (!handle) {
fprintf(stderr, "%s\n", dlerror());
exit(1);
diff --git a/tools/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
similarity index 100%
rename from tools/kconfig/kxgettext.c
rename to scripts/kconfig/kxgettext.c
diff --git a/tools/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
similarity index 100%
rename from tools/kconfig/lex.zconf.c_shipped
rename to scripts/kconfig/lex.zconf.c_shipped
diff --git a/tools/kconfig/lkc.h b/scripts/kconfig/lkc.h
similarity index 100%
rename from tools/kconfig/lkc.h
rename to scripts/kconfig/lkc.h
diff --git a/tools/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
similarity index 100%
rename from tools/kconfig/lkc_proto.h
rename to scripts/kconfig/lkc_proto.h
diff --git a/tools/kconfig/lxdialog/.gitignore b/scripts/kconfig/lxdialog/.gitignore
similarity index 100%
rename from tools/kconfig/lxdialog/.gitignore
rename to scripts/kconfig/lxdialog/.gitignore
diff --git a/tools/kconfig/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from tools/kconfig/lxdialog/BIG.FAT.WARNING
rename to scripts/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/tools/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
similarity index 100%
rename from tools/kconfig/lxdialog/check-lxdialog.sh
rename to scripts/kconfig/lxdialog/check-lxdialog.sh
diff --git a/tools/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
similarity index 100%
rename from tools/kconfig/lxdialog/checklist.c
rename to scripts/kconfig/lxdialog/checklist.c
diff --git a/tools/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
similarity index 100%
rename from tools/kconfig/lxdialog/dialog.h
rename to scripts/kconfig/lxdialog/dialog.h
diff --git a/tools/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from tools/kconfig/lxdialog/inputbox.c
rename to scripts/kconfig/lxdialog/inputbox.c
diff --git a/tools/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
similarity index 100%
rename from tools/kconfig/lxdialog/menubox.c
rename to scripts/kconfig/lxdialog/menubox.c
diff --git a/tools/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
similarity index 100%
rename from tools/kconfig/lxdialog/textbox.c
rename to scripts/kconfig/lxdialog/textbox.c
diff --git a/tools/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
similarity index 100%
rename from tools/kconfig/lxdialog/util.c
rename to scripts/kconfig/lxdialog/util.c
diff --git a/tools/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
similarity index 100%
rename from tools/kconfig/lxdialog/yesno.c
rename to scripts/kconfig/lxdialog/yesno.c
diff --git a/tools/kconfig/mconf.c b/scripts/kconfig/mconf.c
similarity index 100%
rename from tools/kconfig/mconf.c
rename to scripts/kconfig/mconf.c
diff --git a/tools/kconfig/menu.c b/scripts/kconfig/menu.c
similarity index 100%
rename from tools/kconfig/menu.c
rename to scripts/kconfig/menu.c
diff --git a/tools/kconfig/nconf.c b/scripts/kconfig/nconf.c
similarity index 100%
rename from tools/kconfig/nconf.c
rename to scripts/kconfig/nconf.c
diff --git a/tools/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
similarity index 100%
rename from tools/kconfig/nconf.gui.c
rename to scripts/kconfig/nconf.gui.c
diff --git a/tools/kconfig/nconf.h b/scripts/kconfig/nconf.h
similarity index 100%
rename from tools/kconfig/nconf.h
rename to scripts/kconfig/nconf.h
diff --git a/tools/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
similarity index 100%
rename from tools/kconfig/qconf.cc
rename to scripts/kconfig/qconf.cc
diff --git a/tools/kconfig/qconf.h b/scripts/kconfig/qconf.h
similarity index 100%
rename from tools/kconfig/qconf.h
rename to scripts/kconfig/qconf.h
diff --git a/tools/kconfig/symbol.c b/scripts/kconfig/symbol.c
similarity index 100%
rename from tools/kconfig/symbol.c
rename to scripts/kconfig/symbol.c
diff --git a/tools/kconfig/util.c b/scripts/kconfig/util.c
similarity index 100%
rename from tools/kconfig/util.c
rename to scripts/kconfig/util.c
diff --git a/tools/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
similarity index 100%
rename from tools/kconfig/zconf.gperf
rename to scripts/kconfig/zconf.gperf
diff --git a/tools/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
similarity index 100%
rename from tools/kconfig/zconf.hash.c_shipped
rename to scripts/kconfig/zconf.hash.c_shipped
diff --git a/tools/kconfig/zconf.l b/scripts/kconfig/zconf.l
similarity index 100%
rename from tools/kconfig/zconf.l
rename to scripts/kconfig/zconf.l
diff --git a/tools/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
similarity index 100%
rename from tools/kconfig/zconf.tab.c_shipped
rename to scripts/kconfig/zconf.tab.c_shipped
diff --git a/tools/kconfig/zconf.y b/scripts/kconfig/zconf.y
similarity index 100%
rename from tools/kconfig/zconf.y
rename to scripts/kconfig/zconf.y
diff --git a/tools/layoutrom.py b/scripts/layoutrom.py
similarity index 100%
rename from tools/layoutrom.py
rename to scripts/layoutrom.py
diff --git a/tools/readserial.py b/scripts/readserial.py
similarity index 100%
rename from tools/readserial.py
rename to scripts/readserial.py
diff --git a/tools/test-build.sh b/scripts/test-build.sh
similarity index 100%
rename from tools/test-build.sh
rename to scripts/test-build.sh
diff --git a/tools/transdump.py b/scripts/transdump.py
similarity index 100%
rename from tools/transdump.py
rename to scripts/transdump.py
diff --git a/tools/vgafixup.py b/scripts/vgafixup.py
similarity index 100%
rename from tools/vgafixup.py
rename to scripts/vgafixup.py
diff --git a/tools/kconfig/POTFILES.in b/tools/kconfig/POTFILES.in
deleted file mode 100644
index f0baccd..0000000
--- a/tools/kconfig/POTFILES.in
+++ /dev/null
@@ -1,12 +0,0 @@
-tools/kconfig/lxdialog/checklist.c
-tools/kconfig/lxdialog/inputbox.c
-tools/kconfig/lxdialog/menubox.c
-tools/kconfig/lxdialog/textbox.c
-tools/kconfig/lxdialog/util.c
-tools/kconfig/lxdialog/yesno.c
-tools/kconfig/mconf.c
-tools/kconfig/conf.c
-tools/kconfig/confdata.c
-tools/kconfig/gconf.c
-tools/kconfig/gconf.glade.h
-tools/kconfig/qconf.cc
--
1.8.3.1
by Hu Tao
cpu hotplug uses bit 2 of GPE instead of bit 1.
Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com>
---
src/q35-acpi-dsdt.dsl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/q35-acpi-dsdt.dsl b/src/q35-acpi-dsdt.dsl
index c031d83..417ac48 100644
--- a/src/q35-acpi-dsdt.dsl
+++ b/src/q35-acpi-dsdt.dsl
@@ -415,11 +415,11 @@ DefinitionBlock (
Method(_L00) {
}
Method(_L01) {
+ }
+ Method(_E02) {
// CPU hotplug event
\_SB.PRSC()
}
- Method(_L02) {
- }
Method(_L03) {
}
Method(_L04) {
--
1.8.1.4
