coreboot-gerrit December 2016

coreboot-gerrit@coreboot.org

1 participants
1140 discussions

Patch set updated for coreboot: MMCONF_SUPPORT: Consolidate resource registration
by Kyösti Mälkki 07 Dec '16

07 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17695 -gerrit commit f941091235e32dc53d3608ec668e77a728b54d3e Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Dec 2 08:56:05 2016 +0200 MMCONF_SUPPORT: Consolidate resource registration Change-Id: Id727270bff9e0288747d178c00f3d747fe223b0f Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/device/device_util.c | 20 ++++++++++ src/include/device/device.h | 3 ++ src/northbridge/amd/agesa/family10/northbridge.c | 21 +++++----- src/northbridge/amd/agesa/family12/northbridge.c | 13 +++--- src/northbridge/amd/agesa/family14/northbridge.c | 6 +-- src/northbridge/amd/agesa/family15/northbridge.c | 6 +-- src/northbridge/amd/agesa/family15rl/northbridge.c | 6 +-- src/northbridge/amd/agesa/family15tn/northbridge.c | 6 +-- src/northbridge/amd/agesa/family16kb/northbridge.c | 6 +-- src/northbridge/amd/amdfam10/northbridge.c | 9 +---- src/northbridge/amd/pi/00630F01/northbridge.c | 11 +----- src/northbridge/amd/pi/00660F01/northbridge.c | 11 +----- src/northbridge/amd/pi/00670F00/northbridge.c | 11 +----- src/northbridge/amd/pi/00730F01/northbridge.c | 11 +----- src/northbridge/intel/fsp_rangeley/northbridge.c | 27 ++++++------- .../intel/fsp_sandybridge/northbridge.c | 46 ++++++---------------- src/northbridge/intel/i3100/northbridge.c | 10 +---- src/northbridge/intel/i945/northbridge.c | 45 ++++++--------------- src/northbridge/intel/nehalem/Kconfig | 4 ++ src/northbridge/intel/nehalem/northbridge.c | 11 +----- src/northbridge/intel/sandybridge/northbridge.c | 46 ++++++---------------- src/northbridge/via/vx900/Kconfig | 4 ++ src/northbridge/via/vx900/northbridge.c | 5 +-- src/soc/intel/fsp_baytrail/northcluster.c | 27 ++++++------- src/soc/intel/sch/northbridge.c | 43 ++++++-------------- 25 files changed, 132 insertions(+), 276 deletions(-) diff --git a/src/device/device_util.c b/src/device/device_util.c index 56afefd..157f7b7 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -888,6 +888,26 @@ void fixed_mem_resource(device_t dev, unsigned long index, resource->flags |= type; } +void mmconf_resource_init(struct resource *resource, resource_t base, + int buses) +{ + resource->base = base; + resource->size = buses * MiB; + resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | + IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + + printk(BIOS_DEBUG, "Adding PCIe enhanced config space BAR " + "0x%08lx-0x%08lx.\n", (unsigned long)(resource->base), + (unsigned long)(resource->base + resource->size)); +} + +void mmconf_resource(struct device *dev, unsigned long index) +{ + struct resource *resource = new_resource(dev, index); + mmconf_resource_init(resource, CONFIG_MMCONF_BASE_ADDRESS, + CONFIG_MMCONF_BUS_NUMBER); +} + void tolm_test(void *gp, struct device *dev, struct resource *new) { struct resource **best_p = gp; diff --git a/src/include/device/device.h b/src/include/device/device.h index 95fabf4..d81399d 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -234,6 +234,9 @@ void pci_domain_scan_bus(struct device *dev); void fixed_mem_resource(device_t dev, unsigned long index, unsigned long basek, unsigned long sizek, unsigned long type); +void mmconf_resource_init(struct resource *res, resource_t base, int buses); +void mmconf_resource(struct device *dev, unsigned long index); + void scan_smbus(device_t bus); void scan_static_bus(device_t bus); void scan_lpc_bus(device_t bus); diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index 2a54892..00799a5 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -424,6 +424,13 @@ static void amdfam10_read_resources(device_t dev) amdfam10_link_read_bases(dev, nodeid, link->link_num); } } + + /* + * This MMCONF resource must be reserved in the PCI domain. + * It is not honored by the coreboot resource allocator if it is in + * the CPU_CLUSTER. + */ + mmconf_resource(dev, 0xc0010058); } static void amdfam10_set_resource(device_t dev, struct resource *resource, @@ -530,6 +537,11 @@ static void amdfam10_set_resources(device_t dev) assign_resources(bus); } } + + res = find_resource(dev, 0xc0010058); + if (res) { + report_resource_stored(dev, res, " <mmconfig>"); + } } static void mcf0_control_init(struct device *dev) @@ -1096,19 +1108,10 @@ static void cpu_bus_init(device_t dev) static void cpu_bus_read_resources(device_t dev) { - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096*256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; } static void cpu_bus_set_resources(device_t dev) { - struct resource *resource = find_resource(dev, 0xc0010058); - if (resource) { - report_resource_stored(dev, resource, " <mmconfig>"); - } pci_dev_set_resources(dev); } diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 6f2896a..e7363f6 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -300,6 +300,14 @@ static void read_resources(device_t dev) amdfam12_link_read_bases(dev, nodeid, link->link_num); } } + + /* + * This MMCONF resource must be reserved in the PCI domain. + * It is not honored by the coreboot resource allocator if it is in + * the CPU_CLUSTER. + */ + mmconf_resource(dev, 0xc0010058); + printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); } @@ -649,11 +657,6 @@ static void cpu_bus_read_resources(device_t dev) { printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096*256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); } diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index f92183e..d66e83a 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -302,11 +302,7 @@ static void nb_read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 5fc9833..77ac720 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -326,11 +326,7 @@ static void nb_read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c index b5f7690..d4970ef 100644 --- a/src/northbridge/amd/agesa/family15rl/northbridge.c +++ b/src/northbridge/amd/agesa/family15rl/northbridge.c @@ -326,11 +326,7 @@ static void read_resources(struct device *dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); } static void set_resource(struct device *dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 2353126..7d36b13 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -325,11 +325,7 @@ static void nb_read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 63e1c2e..641487f 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -325,11 +325,7 @@ static void read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the APIC_CLUSTER. */ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index cc2e6f9..43480d2 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -741,14 +741,7 @@ static void amdfam10_domain_read_resources(device_t dev) pci_domain_read_resources(dev); /* We have MMCONF_SUPPORT, create the resource window. */ - struct resource *res = new_resource(dev, 0xc0010058); - res->base = CONFIG_MMCONF_BASE_ADDRESS; - res->size = CONFIG_MMCONF_BUS_NUMBER * 1024 * 1024; /* Each bus needs 1M */ - res->align = log2(res->size); - res->gran = log2(res->size); - res->limit = 0xffffffffffffffffULL; /* 64-bit location allowed */ - res->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xc0010058); /* Reserve lower DRAM region to force PCI MMIO region to correct location above 0xefffffff */ ram_resource(dev, 7, 0, rdmsr(TOP_MEM).lo >> 10); diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 4872db0..f863c73 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -309,15 +309,6 @@ static void amdfam15_link_read_bases(device_t dev, u32 nodeid, u32 link) } -static void enable_mmconf_resource(device_t dev) -{ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; -} - static void read_resources(device_t dev) { u32 nodeid; @@ -335,7 +326,7 @@ static void read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - enable_mmconf_resource(dev); + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c index 4c1254c..941c39a 100644 --- a/src/northbridge/amd/pi/00660F01/northbridge.c +++ b/src/northbridge/amd/pi/00660F01/northbridge.c @@ -304,15 +304,6 @@ static void amdfam15_link_read_bases(device_t dev, u32 nodeid, u32 link) } -static void enable_mmconf_resource(device_t dev) -{ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; -} - static void read_resources(device_t dev) { u32 nodeid; @@ -330,7 +321,7 @@ static void read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - enable_mmconf_resource(dev); + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/pi/00670F00/northbridge.c b/src/northbridge/amd/pi/00670F00/northbridge.c index 9a39410..b258aeda 100644 --- a/src/northbridge/amd/pi/00670F00/northbridge.c +++ b/src/northbridge/amd/pi/00670F00/northbridge.c @@ -304,15 +304,6 @@ static void amdfam15_link_read_bases(device_t dev, u32 nodeid, u32 link) } -static void enable_mmconf_resource(device_t dev) -{ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; -} - static void read_resources(device_t dev) { u32 nodeid; @@ -330,7 +321,7 @@ static void read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - enable_mmconf_resource(dev); + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 44f91e2..dbb4181 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -312,15 +312,6 @@ static void amdfam16_link_read_bases(device_t dev, u32 nodeid, u32 link) } -static void enable_mmconf_resource(device_t dev) -{ - struct resource *resource = new_resource(dev, 0xc0010058); - resource->base = CONFIG_MMCONF_BASE_ADDRESS; - resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; -} - static void read_resources(device_t dev) { u32 nodeid; @@ -338,7 +329,7 @@ static void read_resources(device_t dev) * It is not honored by the coreboot resource allocator if it is in * the CPU_CLUSTER. */ - enable_mmconf_resource(dev); + mmconf_resource(dev, 0xc0010058); } static void set_resource(device_t dev, struct resource *resource, u32 nodeid) diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c index f01333e..0134eff 100644 --- a/src/northbridge/intel/fsp_rangeley/northbridge.c +++ b/src/northbridge/intel/fsp_rangeley/northbridge.c @@ -57,13 +57,12 @@ int bridge_silicon_revision(void) static const int legacy_hole_base_k = 0xa0000 / 1024; static const int legacy_hole_size_k = 384; -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; *base = 0; - *len = 0; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); if (!dev) @@ -76,25 +75,13 @@ static int get_pcie_bar(u32 *base, u32 *len) *base = pciexbar_reg & ((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28)); - *len = 256 * 1024 * 1024; /* 256MB ECAM range */ - return 1; + return 256; } static int add_fixed_resources(struct device *dev, int index) { struct resource *resource; - u32 pcie_config_base, pcie_config_size; - - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar base=0x%08x " - "size=0x%x\n", pcie_config_base, pcie_config_size); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } resource = new_resource(dev, index++); /* Local APIC */ resource->base = LAPIC_DEFAULT_BASE; @@ -154,9 +141,19 @@ static void mc_add_dram_resources(device_t dev) static void mc_read_resources(device_t dev) { + u32 pcie_config_base; + int buses; + /* Call the normal read_resources */ pci_dev_read_resources(dev); + /* We use 0xcf as an unused index for our PCIe bar so that we find it again */ + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } + /* Calculate and add DRAM resources. */ mc_add_dram_resources(dev); } diff --git a/src/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c index 50615b5..c9f6e1c 100644 --- a/src/northbridge/intel/fsp_sandybridge/northbridge.c +++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c @@ -62,13 +62,12 @@ int bridge_silicon_revision(void) static const int legacy_hole_base_k = 0xa0000 / 1024; static const int legacy_hole_size_k = 384; -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; *base = 0; - *len = 0; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); if (!dev) @@ -82,16 +81,13 @@ static int get_pcie_bar(u32 *base, u32 *len) switch ((pciexbar_reg >> 1) & 3) { case 0: // 256MB *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)); - *len = 256 * 1024 * 1024; - return 1; + return 256; case 1: // 128M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)); - *len = 128 * 1024 * 1024; - return 1; + return 128; case 2: // 64M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)|(1 << 26)); - *len = 64 * 1024 * 1024; - return 1; + return 64; } return 0; @@ -99,21 +95,8 @@ static int get_pcie_bar(u32 *base, u32 *len) static void add_fixed_resources(struct device *dev, int index) { - struct resource *resource; - u32 pcie_config_base, pcie_config_size; - mmio_resource(dev, index++, uma_memory_base >> 10, uma_memory_size >> 10); - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar base=0x%08x " - "size=0x%x\n", pcie_config_base, pcie_config_size); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } - mmio_resource(dev, index++, legacy_hole_base_k, legacy_hole_size_k); } @@ -256,24 +239,17 @@ static struct device_operations pci_domain_ops = { static void mc_read_resources(device_t dev) { - struct resource *resource; + u32 pcie_config_base; + int buses; pci_dev_read_resources(dev); - /* So, this is one of the big mysteries in the coreboot resource - * allocator. This resource should make sure that the address space - * of the PCIe memory mapped config space bar. But it does not. - */ - /* We use 0xcf as an unused index for our PCIe bar so that we find it again */ - resource = new_resource(dev, 0xcf); - resource->base = DEFAULT_PCIEXBAR; - resource->size = 64 * 1024 * 1024; /* 64MB hard coded PCIe config space */ - resource->flags = - IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | - IORESOURCE_ASSIGNED; - printk(BIOS_DEBUG, "Adding PCIe enhanced config space BAR 0x%08lx-0x%08lx.\n", - (unsigned long)(resource->base), (unsigned long)(resource->base + resource->size)); + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } } static void mc_set_resources(device_t dev) diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c index 8025ac3..4549f85 100644 --- a/src/northbridge/intel/i3100/northbridge.c +++ b/src/northbridge/intel/i3100/northbridge.c @@ -32,9 +32,6 @@ #include <arch/acpi.h> -static u32 max_bus; - - static void pci_domain_set_resources(device_t dev) { device_t mc_dev; @@ -139,14 +136,9 @@ static struct device_operations pci_domain_ops = { static void mc_read_resources(device_t dev) { - struct resource *resource; - pci_dev_read_resources(dev); - resource = new_resource(dev, 0xcf); - resource->base = 0xe0000000; - resource->size = max_bus * 4096*256; - resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + mmconf_resource(dev, 0xcf); } static void mc_set_resources(device_t dev) diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 5d18591..c027bec 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -27,13 +27,12 @@ #include <arch/acpi.h> #include "i945.h" -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; *base = 0; - *len = 0; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); if (!dev) @@ -47,36 +46,18 @@ static int get_pcie_bar(u32 *base, u32 *len) switch ((pciexbar_reg >> 1) & 3) { case 0: // 256MB *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)); - *len = 256 * 1024 * 1024; - return 1; + return 256; case 1: // 128M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)); - *len = 128 * 1024 * 1024; - return 1; + return 128; case 2: // 64M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)|(1 << 26)); - *len = 64 * 1024 * 1024; - return 1; + return 64; } return 0; } -static void add_fixed_resources(struct device *dev, int index) -{ - struct resource *resource; - u32 pcie_config_base, pcie_config_size; - - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar\n"); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } -} - static void pci_domain_set_resources(device_t dev) { uint32_t pci_tolm; @@ -153,8 +134,6 @@ static void pci_domain_set_resources(device_t dev) uma_resource(dev, 5, uma_memory_base >> 10, uma_memory_size >> 10); mmio_resource(dev, 6, tseg_memory_base >> 10, tseg_memory_size >> 10); - add_fixed_resources(dev, 7); - assign_resources(dev->link_list); } @@ -173,19 +152,17 @@ static struct device_operations pci_domain_ops = { static void mc_read_resources(device_t dev) { - struct resource *resource; + u32 pcie_config_base; + int buses; pci_dev_read_resources(dev); /* We use 0xcf as an unused index for our PCIe bar so that we find it again */ - resource = new_resource(dev, 0xcf); - resource->base = DEFAULT_PCIEXBAR; - resource->size = 64 * 1024 * 1024; /* 64MB hard coded PCIe config space */ - resource->flags = - IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | - IORESOURCE_ASSIGNED; - printk(BIOS_DEBUG, "Adding PCIe enhanced config space BAR 0x%08lx-0x%08lx.\n", - (unsigned long)(resource->base), (unsigned long)(resource->base + resource->size)); + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } } static void mc_set_resources(device_t dev) diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig index 4dada50..884660a 100644 --- a/src/northbridge/intel/nehalem/Kconfig +++ b/src/northbridge/intel/nehalem/Kconfig @@ -24,6 +24,10 @@ config NORTHBRIDGE_INTEL_NEHALEM if NORTHBRIDGE_INTEL_NEHALEM +config MMCONF_BUS_NUMBER + int + default 256 + config CBFS_SIZE hex default 0x100000 diff --git a/src/northbridge/intel/nehalem/northbridge.c b/src/northbridge/intel/nehalem/northbridge.c index 06c0a96..779e49c 100644 --- a/src/northbridge/intel/nehalem/northbridge.c +++ b/src/northbridge/intel/nehalem/northbridge.c @@ -69,11 +69,6 @@ static void add_fixed_resources(struct device *dev, int index) 0xfed1c000-0xfed20000 RCBA 0xfed90000-0xfed94000 IOMMU 0xff800000-0xffffffff ROM. */ - resource = new_resource(dev, index++); - resource->base = (resource_t) 0xe0000000; - resource->size = (resource_t) 0x10000000; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; resource = new_resource(dev, index++); resource->base = (resource_t) 0xfed00000; @@ -98,10 +93,6 @@ static void pci_domain_set_resources(device_t dev) assign_resources(dev->link_list); } - /* TODO We could determine how many PCIe busses we need in - * the bar. For now that number is hardcoded to a max of 64. - * See e7525/northbridge.c for an example. - */ static struct device_operations pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, @@ -119,6 +110,8 @@ static void mc_read_resources(device_t dev) pci_dev_read_resources(dev); + mmconf_resource(dev, 0x50); + tseg_base = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0, 0)), TSEG); TOUUD = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0, 0)), D0F0_TOUUD); diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index fe1a07c..7f7c842 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -61,13 +61,12 @@ int bridge_silicon_revision(void) static const int legacy_hole_base_k = 0xa0000 / 1024; static const int legacy_hole_size_k = 384; -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; *base = 0; - *len = 0; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); if (!dev) @@ -81,16 +80,13 @@ static int get_pcie_bar(u32 *base, u32 *len) switch ((pciexbar_reg >> 1) & 3) { case 0: // 256MB *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)); - *len = 256 * 1024 * 1024; - return 1; + return 256; case 1: // 128M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)); - *len = 128 * 1024 * 1024; - return 1; + return 128; case 2: // 64M *base = pciexbar_reg & ((1 << 31)|(1 << 30)|(1 << 29)|(1 << 28)|(1 << 27)|(1 << 26)); - *len = 64 * 1024 * 1024; - return 1; + return 64; } return 0; @@ -98,21 +94,8 @@ static int get_pcie_bar(u32 *base, u32 *len) static void add_fixed_resources(struct device *dev, int index) { - struct resource *resource; - u32 pcie_config_base, pcie_config_size; - mmio_resource(dev, index++, uma_memory_base >> 10, uma_memory_size >> 10); - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar base=0x%08x " - "size=0x%x\n", pcie_config_base, pcie_config_size); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } - mmio_resource(dev, index++, legacy_hole_base_k, (0xc0000 >> 10) - legacy_hole_base_k); reserved_ram_resource(dev, index++, 0xc0000 >> 10, @@ -276,24 +259,17 @@ static struct device_operations pci_domain_ops = { static void mc_read_resources(device_t dev) { - struct resource *resource; + u32 pcie_config_base; + int buses; pci_dev_read_resources(dev); - /* So, this is one of the big mysteries in the coreboot resource - * allocator. This resource should make sure that the address space - * of the PCIe memory mapped config space bar. But it does not. - */ - /* We use 0xcf as an unused index for our PCIe bar so that we find it again */ - resource = new_resource(dev, 0xcf); - resource->base = DEFAULT_PCIEXBAR; - resource->size = 64 * 1024 * 1024; /* 64MB hard coded PCIe config space */ - resource->flags = - IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | - IORESOURCE_ASSIGNED; - printk(BIOS_DEBUG, "Adding PCIe enhanced config space BAR 0x%08lx-0x%08lx.\n", - (unsigned long)(resource->base), (unsigned long)(resource->base + resource->size)); + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } } static void mc_set_resources(device_t dev) diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig index 73d40ad..4b1e6cc 100644 --- a/src/northbridge/via/vx900/Kconfig +++ b/src/northbridge/via/vx900/Kconfig @@ -33,6 +33,10 @@ config MMCONF_BASE_ADDRESS hex default 0xe0000000 +config MMCONF_BUS_NUMBER + int + default 256 + config VGA_BIOS_ID string default "1106,7122" diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c index a4a8ece..7429c4f 100644 --- a/src/northbridge/via/vx900/northbridge.c +++ b/src/northbridge/via/vx900/northbridge.c @@ -297,10 +297,7 @@ static void vx900_read_resources(device_t dev) /* Now do the same for our MMCONF * We always run with MMCONF enabled. We need to access the extended * config space when configuring PCI-Express links */ - res = new_resource(dev, idx++); - res->size = 256 * MiB; - res->base = CONFIG_MMCONF_BASE_ADDRESS; - res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; + mmconf_resource(dev, idx++); pci_domain_read_resources(dev); } diff --git a/src/soc/intel/fsp_baytrail/northcluster.c b/src/soc/intel/fsp_baytrail/northcluster.c index bf1a388..b4aceee 100644 --- a/src/soc/intel/fsp_baytrail/northcluster.c +++ b/src/soc/intel/fsp_baytrail/northcluster.c @@ -86,13 +86,12 @@ uint32_t nc_read_top_of_low_memory(void) return fsp_mem_base; } -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; *base = 0; - *len = 0; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); if (!dev) @@ -105,26 +104,13 @@ static int get_pcie_bar(u32 *base, u32 *len) *base = pciexbar_reg & ((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28)); - *len = 256 * 1024 * 1024; /* 256MB ECAM range */ - return 1; + return 256; } static int add_fixed_resources(struct device *dev, int index) { struct resource *resource; - u32 pcie_config_base, pcie_config_size; - - - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar base=0x%08x " - "size=0x%x\n", pcie_config_base, pcie_config_size); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } resource = new_resource(dev, index++); /* Local APIC */ resource->base = LAPIC_DEFAULT_BASE; @@ -182,9 +168,18 @@ static void mc_add_dram_resources(device_t dev) static void nc_read_resources(device_t dev) { + u32 pcie_config_base; + int buses; + /* Call the normal read_resources */ pci_dev_read_resources(dev); + /* We use 0xcf as an unused index for our PCIe bar so that we find it again */ + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } /* Calculate and add DRAM resources. */ mc_add_dram_resources(dev); diff --git a/src/soc/intel/sch/northbridge.c b/src/soc/intel/sch/northbridge.c index 390a0bc..2d39490 100644 --- a/src/soc/intel/sch/northbridge.c +++ b/src/soc/intel/sch/northbridge.c @@ -27,7 +27,7 @@ #include <arch/acpi.h> #include "sch.h" -static int get_pcie_bar(u32 *base, u32 *len) +static int get_pcie_bar(u32 *base) { device_t dev; u32 pciexbar_reg; @@ -50,18 +50,15 @@ static int get_pcie_bar(u32 *base, u32 *len) case 0: /* 256MB */ *base = pciexbar_reg & ((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28)); - *len = 256 * 1024 * 1024; - return 1; + return 256; case 1: /* 128M */ *base = pciexbar_reg & ((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28) | (1 << 27)); - *len = 128 * 1024 * 1024; - return 1; + return 128; case 2: /* 64M */ *base = pciexbar_reg & ((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28) | (1 << 27) | (1 << 26)); - *len = 64 * 1024 * 1024; - return 1; + return 64; } return 0; @@ -70,16 +67,6 @@ static int get_pcie_bar(u32 *base, u32 *len) static void add_fixed_resources(struct device *dev, int index) { struct resource *resource; - u32 pcie_config_base, pcie_config_size; - - if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { - printk(BIOS_DEBUG, "Adding PCIe config bar\n"); - resource = new_resource(dev, index++); - resource->base = (resource_t) pcie_config_base; - resource->size = (resource_t) pcie_config_size; - resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - } printk(BIOS_DEBUG, "Adding CMC shadow area\n"); resource = new_resource(dev, index++); @@ -198,28 +185,20 @@ static struct device_operations pci_domain_ops = { static void mc_read_resources(device_t dev) { - struct resource *resource; + u32 pcie_config_base; + int buses; pci_dev_read_resources(dev); /* - * So, this is one of the big mysteries in the coreboot resource - * allocator. This resource should make sure that the address space - * of the PCIe memory mapped config space bar. But it does not. - */ - - /* * We use 0xcf as an unused index for our PCIe bar so that we find * it again. */ - resource = new_resource(dev, 0xcf); - resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED | - IORESOURCE_STORED | IORESOURCE_ASSIGNED; - get_pcie_bar((u32 *)&resource->base, (u32 *)&resource->size); - printk(BIOS_DEBUG, - "Adding PCIe enhanced config space BAR 0x%08lx-0x%08lx.\n", - (unsigned long)(resource->base), - (unsigned long)(resource->base + resource->size)); + buses = get_pcie_bar(&pcie_config_base); + if (buses) { + struct resource *resource = new_resource(dev, 0xcf); + mmconf_resource_init(resource, pcie_config_base, buses); + } } static void mc_set_resources(device_t dev)

1 0

Patch set updated for coreboot: superio/fintek: Add support for Fintek F71889A.
by Marty Plummer 07 Dec '16

07 Dec '16

Marty Plummer (ntzrmtthihu777(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17669 -gerrit commit 72028398387f0fe5460de72c4b8042cddcb54db5 Author: Marty Plummer <ntzrmtthihu777(a)gmail.com> Date: Thu Dec 1 02:14:39 2016 -0600 superio/fintek: Add support for Fintek F71889A. Datasheet: F71889A rev V0.21P Change-Id: I91c60a3b48cd4872ae7a27de8f49faa40e877a27 Signed-off-by: Marty Plummer <ntzrmtthihu777(a)gmail.com> --- src/superio/fintek/Makefile.inc | 1 + src/superio/fintek/f71889a/Kconfig | 20 +++++++++ src/superio/fintek/f71889a/Makefile.inc | 18 ++++++++ src/superio/fintek/f71889a/f71889a.h | 33 +++++++++++++++ src/superio/fintek/f71889a/superio.c | 73 +++++++++++++++++++++++++++++++++ 5 files changed, 145 insertions(+) diff --git a/src/superio/fintek/Makefile.inc b/src/superio/fintek/Makefile.inc index 0d0ae66..d70fc99 100644 --- a/src/superio/fintek/Makefile.inc +++ b/src/superio/fintek/Makefile.inc @@ -21,6 +21,7 @@ subdirs-y += f71859 subdirs-y += f71863fg subdirs-y += f71869ad subdirs-y += f71872 +subdirs-y += f71889a subdirs-y += f81216h subdirs-y += f81865f subdirs-y += f81866d diff --git a/src/superio/fintek/f71889a/Kconfig b/src/superio/fintek/f71889a/Kconfig new file mode 100644 index 0000000..96366d9 --- /dev/null +++ b/src/superio/fintek/f71889a/Kconfig @@ -0,0 +1,20 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com> +# Copyright (C) 2016 Marty Plummer <ntzrmtthihu777(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +config SUPERIO_FINTEK_F71889A + bool + select SUPERIO_FINTEK_COMMON_ROMSTAGE diff --git a/src/superio/fintek/f71889a/Makefile.inc b/src/superio/fintek/f71889a/Makefile.inc new file mode 100644 index 0000000..06fcff9 --- /dev/null +++ b/src/superio/fintek/f71889a/Makefile.inc @@ -0,0 +1,18 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com> +## Copyright (C) 2016 Marty Plummer <ntzrmtthihu777(a)gmail.com> +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +ramstage-$(CONFIG_SUPERIO_FINTEK_F71889A) += superio.c diff --git a/src/superio/fintek/f71889a/f71889a.h b/src/superio/fintek/f71889a/f71889a.h new file mode 100644 index 0000000..4a272a6 --- /dev/null +++ b/src/superio/fintek/f71889a/f71889a.h @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com> + * Copyright (C) 2016 Marty Plummer <ntzrmtthihu777(a)gmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef SUPERIO_FINTEK_F71889A_H +#define SUPERIO_FINTEK_F71889A_H + +/* Logical Device Numbers (LDN). */ +#define F71889A_SP1 0x01 /* UART1 */ +#define F71889A_SP2 0x02 /* UART2 */ +#define F71889A_PP 0x03 /* Parallel Port */ +#define F71889A_HWM 0x04 /* Hardware Monitor */ +#define F71889A_KBC 0x05 /* Keyboard/Mouse */ +#define F71889A_GPIO 0x06 /* GPIO */ +#define F71889A_WDT 0x07 /* WDT */ +#define F71889A_CIR 0x08 /* CIR */ +#define F71889A_PM 0x0a /* ACPI/PME */ +#define F71889A_VREF 0x0b /* VREF */ + +#endif /* SUPERIO_FINTEK_F71889A_H */ diff --git a/src/superio/fintek/f71889a/superio.c b/src/superio/fintek/f71889a/superio.c new file mode 100644 index 0000000..7b609fd --- /dev/null +++ b/src/superio/fintek/f71889a/superio.c @@ -0,0 +1,73 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com> + * Copyright (C) 2016 Marty Plummer <ntzrmtthihu777(a)gmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <arch/io.h> +#include <device/device.h> +#include <device/pnp.h> +#include <superio/conf_mode.h> +#include <console/console.h> +#include <stdlib.h> +#include <pc80/keyboard.h> +#include "f71889a.h" + +static void f71889a_init(struct device *dev) +{ + if (!dev->enabled) + return; + + switch (dev->path.pnp.device) { + + case F71889A_KBC: + pc_keyboard_init(NO_AUX_DEVICE); + break; + } +} + +static struct device_operations ops = { + .read_resources = pnp_read_resources, + .set_resources = pnp_set_resources, + .enable_resources = pnp_enable_resources, + .enable = pnp_alt_enable, + .init = f71889a_init, + .ops_pnp_mode = &pnp_conf_mode_8787_aa, +}; + +static struct pnp_info pnp_dev_info[] = { + /* TODO: Some of the 0x07f8 etc. values may not be correct. + * double check bitmasks + */ + { &ops, F71889A_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, F71889A_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, F71889A_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, + { &ops, F71889A_HWM, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, F71889A_KBC, PNP_IO0 | PNP_IRQ0 | PNP_IRQ1, {0x07f8, 0}, }, + { &ops, F71889A_GPIO, }, + { &ops, F71889A_WDT, PNP_IO0, {0x0ff8, 0}, }, + { &ops, F71889A_CIR, PNP_IO0 | PNP_IRQ0, {0x7ff, 0}, }, + { &ops, F71889A_PM, }, + { &ops, F71889A_VREF, }, +}; + +static void enable_dev(struct device *dev) +{ + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); +} + +struct chip_operations superio_fintek_f71889a_ops = { + CHIP_NAME("Fintek F71889A Super I/O") + .enable_dev = enable_dev +};

1 0

New patch to review for coreboot: google/beltino, tidus: simplify led_power_on() function
by Matt DeVillier 07 Dec '16

07 Dec '16

Matt DeVillier (matt.devillier(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17744 -gerrit commit cae045be60220c851e8f65cb2902c4383ebe96d5 Author: Matt DeVillier <matt.devillier(a)gmail.com> Date: Tue Dec 6 17:59:23 2016 -0600 google/beltino, tidus: simplify led_power_on() function Simplify set_power_led() by consolidating switch and setting values as needed inline based on LED state. Remove unnecesary function param, includes for Tidus. Change-Id: I28e6fac5f8d7e2ff419002db714ce88697895faf Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- .../google/beltino/variants/mccloud/led.c | 34 ++++++-------------- src/mainboard/google/tidus/led.c | 37 ++++++---------------- src/mainboard/google/tidus/onboard.h | 2 +- src/mainboard/google/tidus/romstage.c | 2 +- src/mainboard/google/tidus/smihandler.c | 5 ++- 5 files changed, 23 insertions(+), 57 deletions(-) diff --git a/src/mainboard/google/beltino/variants/mccloud/led.c b/src/mainboard/google/beltino/variants/mccloud/led.c index da303e8..ce8d2d8 100644 --- a/src/mainboard/google/beltino/variants/mccloud/led.c +++ b/src/mainboard/google/beltino/variants/mccloud/led.c @@ -19,29 +19,13 @@ void set_power_led(int state) { - switch (state) { - case LED_ON: - case LED_OFF: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 1 /* set */, - 0x01 /* select */, - state /* polarity: state dependent */, - 0x00 /* 0=pulldown */, - 0x01 /* output */, - 0x01 /* 1=Simple IO function */, - SIO_GPIO_BLINK_GPIO10, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - case LED_BLINK: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 1 /* set */, - 0x01 /* select */, - 0x01 /* polarity */, - 0x01 /* 1=pullup */, - 0x01 /* output */, - 0x00, /* 0=Alternate function */ - SIO_GPIO_BLINK_GPIO10, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - } + it8772f_gpio_led(IT8772F_GPIO_DEV, + 1, /* set */ + 0x01, /* select */ + state == LED_OFF ? 0x00 : 0x01, /* polarity */ + state == LED_BLINK ? 0x01 : 0x00, /* pullup/pulldown */ + 0x01, /* output */ + state == LED_BLINK ? 0x00 : 0x01, /* I/O function */ + SIO_GPIO_BLINK_GPIO10, + IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); } diff --git a/src/mainboard/google/tidus/led.c b/src/mainboard/google/tidus/led.c index c0bf332..a21b3b5 100644 --- a/src/mainboard/google/tidus/led.c +++ b/src/mainboard/google/tidus/led.c @@ -14,35 +14,18 @@ */ #include <types.h> -#include <arch/io.h> #include <superio/ite/it8772f/it8772f.h> #include "onboard.h" -void set_power_led(u8 led_pin_map, int state) +void set_power_led(int state) { - switch (state) { - case LED_ON: - case LED_OFF: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 1 /* set */, - 0x01 /* select */, - state /* polarity: non-inverting */, - 0x00 /* 0=pulldown */, - 0x01 /* output */, - 0x01 /* 1=Simple IO function */, - led_pin_map, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - case LED_BLINK: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 1 /* set */, - 0x01 /* select */, - 0x01 /* polarity */, - 0x01 /* 1=pullup */, - 0x01 /* output */, - 0x00, /* 0=Alternate function */ - led_pin_map, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - } + it8772f_gpio_led(IT8772F_GPIO_DEV, + 1, /* set */ + 0x01, /* select */ + state == LED_OFF ? 0x00 : 0x01, /* polarity */ + state == LED_BLINK ? 0x01 : 0x00, /* pullup/pulldown */ + 0x01, /* output */ + state == LED_BLINK ? 0x00 : 0x01, /* I/O function */ + SIO_GPIO_BLINK_GPIO10, + IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); } diff --git a/src/mainboard/google/tidus/onboard.h b/src/mainboard/google/tidus/onboard.h index 793c88f..6085c7d 100644 --- a/src/mainboard/google/tidus/onboard.h +++ b/src/mainboard/google/tidus/onboard.h @@ -19,7 +19,7 @@ #ifndef __ACPI__ void lan_init(void); -void set_power_led(u8 led_pin_map, int state); +void set_power_led(int state); enum { LED_OFF = 0, diff --git a/src/mainboard/google/tidus/romstage.c b/src/mainboard/google/tidus/romstage.c index 351fc616..703eaea 100644 --- a/src/mainboard/google/tidus/romstage.c +++ b/src/mainboard/google/tidus/romstage.c @@ -56,6 +56,6 @@ void mainboard_pre_console_init(void) ite_enable_serial(IT8772F_SERIAL_DEV, CONFIG_TTYS0_BASE); /* Turn On GPIO10.LED */ - set_power_led(SIO_GPIO_BLINK_GPIO10, LED_ON); + set_power_led(LED_ON); } diff --git a/src/mainboard/google/tidus/smihandler.c b/src/mainboard/google/tidus/smihandler.c index 68bc2c2..6bd93d3 100644 --- a/src/mainboard/google/tidus/smihandler.c +++ b/src/mainboard/google/tidus/smihandler.c @@ -27,7 +27,6 @@ #include <soc/nvs.h> #include <soc/pm.h> #include <soc/smm.h> -#include <superio/ite/it8772f/it8772f.h> #include "onboard.h" /* USB Charger Control: GPIO26 */ @@ -63,13 +62,13 @@ void mainboard_smi_sleep(u8 slp_typ) /* Disable USB charging if required */ switch (slp_typ) { case ACPI_S3: - set_power_led(SIO_GPIO_BLINK_GPIO10, LED_BLINK); + set_power_led(LED_BLINK); /* Enable DCP mode */ set_gpio(GPIO_USB_CTL_1, 0); break; case ACPI_S5: - set_power_led(SIO_GPIO_BLINK_GPIO10, LED_OFF); + set_power_led(LED_OFF); break; } }

1 0

Patch set updated for coreboot: google/beltino: fix LED, simplify function for Tricky variant
by Matt DeVillier 07 Dec '16

07 Dec '16

Matt DeVillier (matt.devillier(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17719 -gerrit commit 98cce732a1da83956fadc57710a107382c4dc2c9 Author: Matt DeVillier <matt.devillier(a)gmail.com> Date: Fri Dec 2 23:27:32 2016 -0600 google/beltino: fix LED, simplify function for Tricky variant Simplify set_power_led() by consolidating switch and setting values as needed inline based on LED state. Fix non-off LED polarity for Tricky using correct value from Chromium source TEST: power on Tricky, observe LED lit / solid Change-Id: I8bc7c4ae3f83d3f37b76fd5c90a4faed7057ebee Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- src/mainboard/google/beltino/variants/tricky/led.c | 34 ++++++---------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/src/mainboard/google/beltino/variants/tricky/led.c b/src/mainboard/google/beltino/variants/tricky/led.c index 72498a3..e6ca6eb 100644 --- a/src/mainboard/google/beltino/variants/tricky/led.c +++ b/src/mainboard/google/beltino/variants/tricky/led.c @@ -19,29 +19,13 @@ void set_power_led(int state) { - switch (state) { - case LED_ON: - case LED_OFF: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 2 /* set */, - 0xF7 /* select */, - state /* polarity: state dependent */, - 0x00 /* 0=pulldown */, - 0x04 /* output */, - 0x04 /* 1=Simple IO function */, - SIO_GPIO_BLINK_GPIO22, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - case LED_BLINK: - it8772f_gpio_led(IT8772F_GPIO_DEV, - 2 /* set */, - 0xF7 /* select */, - 0x04 /* polarity */, - 0x04 /* 1=pullup */, - 0x04 /* output */, - 0x00, /* 0=Alternate function */ - SIO_GPIO_BLINK_GPIO22, - IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); - break; - } + it8772f_gpio_led(IT8772F_GPIO_DEV, + 2, /* set */ + 0xF7, /* select */ + state == LED_OFF ? 0x00 : 0x04, /* polarity */ + state == LED_BLINK ? 0x04 : 0x00, /* pullup/pulldown */ + 0x04, /* output */ + state == LED_BLINK ? 0x00 : 0x04, /* I/O function */ + SIO_GPIO_BLINK_GPIO22, + IT8772F_GPIO_BLINK_FREQUENCY_1_HZ); }

1 0

Patch set updated for coreboot: util/crossgcc: Toolchain verified sources
by Philipp Deppenwiese 06 Dec '16

06 Dec '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15170 -gerrit commit 4818b949722db619be7ed64cbcd402f1f6d19933 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Jun 13 17:01:07 2016 -0700 util/crossgcc: Toolchain verified sources Currently there is no toolchain verification in coreboot. This patchset extends the existing buildgcc script in the following way: Before download or unpack operations the checksum of all used packages are checked against the trustworthy checksums in util/crossgcc/sum. With the option -g checksum can be automatically generated for updated packages as long they support gpg. Only the maintainers can commit checksum changes to the coreboot repository. Some libraries don't offer this possiblity and on update maintainers need to check the sources by themself adding checksums manually! The checksum algorithm changed from sha1 to sha384. If you ask yourself why we don't use sha256 or sha512 for the checksum verification. You should take a look at following wiki article. https://en.wikipedia.org/wiki/Length_extension_attack Change-Id: Id45097fc7e8435fadce4bda75769592af2730b0c Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- util/crossgcc/buildgcc | 246 ++++++++++++++++----- util/crossgcc/gpg.keyring | Bin 0 -> 222182 bytes util/crossgcc/sum/Python-3.5.1.tar.xz.cksum | 2 +- .../sum/acpica-unix2-20160831.tar.gz.cksum | 2 +- util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum | 2 +- .../sum/clang-tools-extra-3.8.0.src.tar.xz.cksum | 2 +- .../sum/compiler-rt-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum | 2 +- util/crossgcc/sum/gdb-7.11.tar.xz.cksum | 2 +- util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum | 2 +- util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum | 2 +- util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/make-4.2.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum | 2 +- util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum | 2 +- util/lint/lint-stable-003-whitespace | 2 +- 18 files changed, 210 insertions(+), 68 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d64b687..51663fc 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -5,6 +5,7 @@ # Stefan Reinauer <stefan.reinauer(a)coresystems.de> # # Copyright (C) 2011 by Sage Electronic Engineering +# Copyright (C) 2016 by Philipp Deppenwiese # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +19,9 @@ cd $(dirname $0) -CROSSGCC_DATE="August 31st, 2016" -CROSSGCC_VERSION="1.43" -CROSSGCC_COMMIT=$( git describe ) +CROSSGCC_DATE="December 07th, 2016" +CROSSGCC_VERSION="1.44" +CROSSGCC_COMMIT=$(git describe) # default settings PACKAGE=GCC @@ -32,6 +33,7 @@ DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 BOOTSTRAP=0 +GENERATE_CHECKSUMS=0 THREADS=1 # GCC toolchain version numbers @@ -50,6 +52,8 @@ EXPAT_VERSION=2.1.1 CLANG_VERSION=3.8.0 MAKE_VERSION=4.2.1 +GPG_KEYRING="$PWD/gpg.keyring" + # GCC toolchain archive locations # These are sanitized by the jenkins toolchain test builder, so if # a completely new URL is added here, it probably needs to be added @@ -100,6 +104,8 @@ red='\033[0;31m' RED='\033[1;31m' green='\033[0;32m' GREEN='\033[1;32m' +yellow='\033[0;33m' +YELLOW='\033[1;33m' blue='\033[0;34m' BLUE='\033[1;34m' cyan='\033[0;36m' @@ -154,6 +160,10 @@ searchtool() -gt 0 ]; then echo $i return + elif [ "$(cat /dev/null | $i version 2>&1 | grep -c "$search")" \ + -gt 0 ]; then + echo $i + return fi fi done @@ -261,60 +271,176 @@ check_cc() { fi } -check_sum() { - test -z "$CHECKSUM" || \ - test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ - "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +verify_signature() { + SIGNATURE_FILE="$1" + SOURCE_FILE="$2" + + if [ -z "${GPG}" ] ; then + printf "\n * ${RED}GPG tool not found. Please install gnupg on your os.${NC}\n" + return 1 + fi + + if [ ! -f "${GPG_KEYRING}" ]; then + printf "\n * ${RED}The gpg keyring can't be found.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SIGNATURE_FILE}" ]; then + printf "\n * ${RED}No signature file found for package: ${SOURCE_FILE} !! PLEASE CHECK MANUALLY WHAT YOU DOWNLOADED, ABORTING CHECKSUM CREATION.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n * ${RED}Source file couldn't be downloaded.${NC}\n" + return 1 + fi + + GPG_OUTPUT=$(${GPG} --no-default-keyring --keyring "${GPG_KEYRING}" --status-fd 1 --verify "tarballs/${SIGNATURE_FILE}" "tarballs/${SOURCE_FILE}" 2>&1) + if [ "$?" = "0" ] ; then + printf "\n * ${GREEN}Signature is good and verified!${NC}" + return 0 + fi + + printf "\n * ${RED}Failed to verify signature of package.${NC}\n" + printf "\n * ${RED}Error: ${GPG_OUTPUT} ${NC}\n" + return 1 } -compute_sum() { - test ! -f sum/$1.cksum && test -f tarballs/$1 && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +calculate_checksum() { + SOURCE_FILE=$1 + + test ! -f sum/"${SOURCE_FILE}".cksum && test -f tarballs/"${SOURCE_FILE}" && \ + ("${OPENSSL}" sha384 tarballs/"${SOURCE_FILE}" > sum/"${SOURCE_FILE}".cksum) && \ + printf "\n * Checksum created. ${CYAN}Note. Please upload sum/${SOURCE_FILE}.cksum if the corresponding archive is upgraded.${NC}" +} + +verify_checksum() { + STATIC_HASH=$(cat sum/$1.cksum) + FILE_HASH=$(${OPENSSL} sha384 tarballs/$1) + + if [ "${STATIC_HASH}" != "${FILE_HASH}" ]; then + printf "\n * ${RED}Failed to verify checksum of package ${1}.${NC}\n" + exit 1 + fi + + printf "\n * ${GREEN}Checksum 0x${FILE_HASH} verified.${NC}\n" +} + +validate_url() { + CHECK_URL=$(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') + if [ "$?" = "0" ] ; then + return 1 + else + return 0 + fi } download_showing_percentage() { - url=$1 - printf " ..${red} 0%%" - wget --no-check-certificate $url 2>&1 | while read line; do - echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' - done - printf "${NC}" + NO_WARNING="$2" + URL=$1 + printf " ..${YELLOW} 0%%${NC}" + + if ! validate_url ${URL}; then + wget ${URL} 2>&1 | while read line; do + printf "${YELLOW}" + echo $line | grep -o "[0-9]\+%" | ${AWK} '{printf("\b\b\b\b%4s", $1)}' + printf "${NC}" + done + if [ $? != "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + elif [ "$NO_WARNING" = "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + return 0 } download() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" - FILE=$(basename $archive) - printf " * $FILE " + SOURCE_FILE=$(basename "${archive}") - if test -f tarballs/$FILE && check_sum $FILE ; then + if test -f "tarballs/${SOURCE_FILE}" ; then printf "(cached)" else + rm -f "tarballs/${SOURCE_FILE}"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " printf "(downloading from $archive)" - rm -f tarballs/$FILE - cd tarballs - download_showing_percentage $archive - cd .. - compute_sum $FILE + download_showing_percentage ${archive} 0 + + cd .. || exit 1 fi - if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + if [ ! -f tarballs/${SOURCE_FILE} ]; then + printf "\n${RED} * Failed to download ${SOURCE_FILE}.${NC}\n" exit 1 fi + echo +} + +generate_checksums() { + package="$1" + archive="$(eval echo \$$package"_ARCHIVE")" + SOURCE_FILE=$(basename "${archive}") + SIGNATURE_FILE="dummy" + + rm -f "tarballs/${SOURCE_FILE}"* + rm -f "sum/${SOURCE_FILE}.cksum"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " + printf "(downloading from ${archive})" + download_showing_percentage "${archive}" 0 + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.sig)" + + download_showing_percentage "${archive}.sig" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.sig) + fi + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.asc)" + + download_showing_percentage "${archive}.asc" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.asc) + fi + + cd .. || exit 1 + + verify_signature "${SIGNATURE_FILE}" "${SOURCE_FILE}" + if [ "$?" = "0" ] ; then + calculate_checksum "${SOURCE_FILE}" + verify_checksum "${SOURCE_FILE}" "${archive}" + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n${RED}Failed to download ${SOURCE_FILE}.${NC}\n" + exit 1 + fi + printf "\n" } unpack_and_patch() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" - test -d ${dir} && test -f ${dir}/.unpack_success || ( + FILE=$(basename "$archive") + + verify_checksum "${FILE}" "${archive}" + + test -d "${dir}" && test -f "${dir}/.unpack_success" || ( printf " * $(basename $archive)\n" FLAGS=zxf - suffix=$(echo $archive | sed 's,.*\.,,') + suffix=$(echo "$archive" | sed 's,.*\.,,') if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" elif [ "$suffix" = "gz" ]; then FLAGS=zxf elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" @@ -356,11 +482,11 @@ package_uses_targetarch() generic_build() { - package=$1 - host_target=$2 - builddir=$3 - success=$4 - version=$5 + package="$1" + host_target="$2" + builddir="$3" + success="$4" + version="$5" fn_exists build_$package || return @@ -426,7 +552,7 @@ cleanup() printf "Cleaning up temporary files... " for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package build-$package $(eval echo \$$package"_DIR") + rm -rf "build-${TARGETARCH}-$package" "build-$package" $(eval echo \$$package"_DIR") done rm -f getopt printf "${green}ok${NC}\n" @@ -434,7 +560,7 @@ cleanup() myhelp() { - printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S]\n" + printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S] [-g]\n" printf " $0 [-V|--version]\n" printf " $0 [-h|--help]\n\n" @@ -464,7 +590,9 @@ myhelp() printf "GDB specific options:\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" + printf " [-S|--scripting] build scripting support for GDB\n" + printf " [-g|--generate-checksums] re-generates the checksum for all packages and\n" + printf " verifies them with the help of gpg signatures\n\n" printf "Platforms for GCC & GDB:\n" printf " x86_64 i386-elf i386-mingw32 mipsel-elf riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" @@ -481,6 +609,7 @@ myversion() cat << EOF Copyright (C) 2008-2010 by coresystems GmbH Copyright (C) 2011 by Sage Electronic Engineering +Copyright (C) 2016 by Philipp Deppenwiese This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -749,12 +878,12 @@ getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,generate_checksums,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:gun -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bp:l:P:j:D:tSys:gun $*) getopt_ret=$? set -- $args fi @@ -782,7 +911,8 @@ while true ; do -s|--supported) shift; PRINTSTABLE="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; -n|--nocolor) shift; \ - unset red RED green GREEN blue BLUE cyan CYAN NC;; + unset red RED green GREEN blue BLUE cyan CYAN yellow YELLOW NC;; + -g|--generate-checksums) shift; GENERATE_CHECKSUMS=1;; --) shift; break;; *) break;; esac @@ -848,6 +978,10 @@ case "$PACKAGE" in NAME="GNU Make" PACKAGES=MAKE ;; + ALL|all) + NAME="All packages" + PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC EXPAT PYTHON GDB LLVM CFE CRT CTE IASL MAKE" + ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n"; exit 1 @@ -856,15 +990,14 @@ esac # Find all the required tools: -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -#SHA512SUM=$(searchtool sha512sum) -#MD5SUM=$(searchtool md5sum) -CHECKSUM=$SHA1SUM -LBZIP2=$(searchtool lbzip2 "" nofail) -PIGZ=$(searchtool pigz "" nofail) +TAR=$(searchtool tar "tar") +PATCH=$(searchtool patch "patch") +MAKE=$(searchtool make "Make") +LBZIP2=$(searchtool lbzip2 "bzip2" nofail) +PIGZ=$(searchtool pigz "pigz" nofail) +GPG=$(searchtool gpg "gpg" nofail) +OPENSSL=$(searchtool openssl "openssl") +AWK=$(searchtool awk "Awk") searchtool m4 > /dev/null searchtool bison > /dev/null @@ -946,6 +1079,15 @@ if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi +if [ "$GENERATE_CHECKSUMS" = 1 ]; then + mkdir -p tarballs + for p in $PACKAGES; do + generate_checksums $p + done + + exit 0 +fi + # Prepare target directory for building GCC # (dependencies must be in the PATH) mkdir -p $DESTDIR$TARGETDIR/bin @@ -977,7 +1119,7 @@ printf "Packages built ... ${green}ok${NC}\n" # for reproducibility PROGNAME=$(basename "$0") rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*" -cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT" +cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT" cleanup diff --git a/util/crossgcc/gpg.keyring b/util/crossgcc/gpg.keyring new file mode 100644 index 0000000..8cbce7e Binary files /dev/null and b/util/crossgcc/gpg.keyring differ diff --git a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum index 58affb0..46f43a3 100644 --- a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum +++ b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum @@ -1 +1 @@ -0186da436db76776196612b98bb9c2f76acfe90e tarballs/Python-3.5.1.tar.xz +SHA384(tarballs/Python-3.5.1.tar.xz)= 9aca49d2cde4760035f4fff23e8a446f6451e8effb6e6fab3f259645a631593acb2ce3412aadf810f103f3f6b561abe7 diff --git a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum index d7e538b..6b39768 100644 --- a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum +++ b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum @@ -1 +1 @@ -7e7449f15a195fefd72b65b1671df18e4dccf665 tarballs/acpica-unix2-20160831.tar.gz +SHA384(tarballs/acpica-unix2-20160831.tar.gz)= 171f914bbfc71a69011494cd3484bc87e5ce6b28558699585c8719c250094140357793ead18d2432573a61a1ea5afc6c diff --git a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum index 4bd0bce..b3a7126 100644 --- a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum +++ b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum @@ -1 +1 @@ -624cd377e3a8eef3db83a56ce289a60f556b3ec2 tarballs/binutils-2.26.1.tar.bz2 +SHA384(tarballs/binutils-2.26.1.tar.bz2)= 30cc8be8c230d69b966b80268223b823b3d301c83472317a4b6ff3aa9dd528a31cb1af33640097854e0e34743b1339b7 diff --git a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum index 7ba8c8c..48ccfbf 100644 --- a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce tarballs/cfe-3.8.0.src.tar.xz +SHA384(tarballs/cfe-3.8.0.src.tar.xz)= 3edbe3cafc58ad6fc3d3a133156a656ea7756e8a36176b29bba63434d6f073cef63241cc6df8337fcab3832dd5b5c485 diff --git a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum index e9d8d72..2c4154c 100644 --- a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -a99d8b6fc5e593c4671424b327779318a1856acf tarballs/clang-tools-extra-3.8.0.src.tar.xz +SHA384(tarballs/clang-tools-extra-3.8.0.src.tar.xz)= abd447239f09295f8592225bb7e07ba57cedc3d19a4972b45cd7d70a2db82106d1874a5be03656f8209a0e8a1308fb31 diff --git a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum index 081705d..8637b48 100644 --- a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -480ea09e369dac6de1f3759b27fa19417b26b69e tarballs/compiler-rt-3.8.0.src.tar.xz +SHA384(tarballs/compiler-rt-3.8.0.src.tar.xz)= 4560d512f3c3a0dbcc5c29ab7754b07d91ffa1ddc1c06a5215f3d325bc3f138ebf483e2a37abb10fc36cd125e6bf559e diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum index 882e501..e3a94fa 100644 --- a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum +++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum @@ -1 +1 @@ -ff91419882ac52151050dad0ee8190645fbeee08 tarballs/expat-2.1.1.tar.bz2 +SHA384(tarballs/expat-2.1.1.tar.bz2)= 816e8ca9ac57b6aac76e9979d11714313246492a49c228bb0a16d349174be45cd780d760524eb45acf12ff371e8b96a3 diff --git a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum index bb05e39..073390b 100644 --- a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum +++ b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum @@ -1 +1 @@ -0612270b103941da08376df4d0ef4e5662a2e9eb tarballs/gcc-5.3.0.tar.bz2 +SHA384(tarballs/gcc-5.3.0.tar.bz2)= 4184972f66dc929686c30936cf8f5085829d8584118ebc3e2ec53a40754afbefc351cfd2c211c09dd3b6eb4ab4759820 diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum index ffe5a1c..f3082e7 100644 --- a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum +++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum @@ -1 +1 @@ -466208d771d97d3dfcf965d5c835a669cff8d847 tarballs/gdb-7.11.tar.xz +SHA384(tarballs/gdb-7.11.tar.xz)= 82f89ef35ea1916d5faa67b7fefa2ac3627894d245c43fb4e20828274566cbbb5d7f83899baad77a3cf7fe9fec6f8c7b diff --git a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum index 348b80f..e0ebab2 100644 --- a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum +++ b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum @@ -1 +1 @@ -99d691607613e749aa5d7c0c2a89aeab38fec070 tarballs/gmp-6.1.0.tar.xz +SHA384(tarballs/gmp-6.1.0.tar.xz)= ec69b394cbcf887ab0717473b04bb70ce30102abf24869eca5acb781de405d3a5670fabb776ba68cfe6e117631522d9f diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum index daa27c6..46f991d 100644 --- a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum +++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum @@ -1 +1 @@ -c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz +SHA384(tarballs/libelf-0.8.13.tar.gz)= 07fc0b1a40ba3d2b003899df199d1043bb5d44cf7d913e6460c985582e5275b634edb6af6779255d770010fd7d09580e diff --git a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum index 2f0af53..e407716 100644 --- a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -723ac918979255706434a05f5af34b71c49c9971 tarballs/llvm-3.8.0.src.tar.xz +SHA384(tarballs/llvm-3.8.0.src.tar.xz)= 5d5a012e4d494a4534fcec7643ad28bab7467b96029b6d497e1d523357ae7c9e8bd86400dc90e261d791d6391a369b30 diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum index 34af72c..5c8a69c9 100644 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum @@ -1 +1 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 +SHA384(tarballs/make-4.2.1.tar.bz2)= 07fed67f907c8139cd27d606069ce20f219ccf1d047d2ebb2a2b3242d4332957a64b7ff8c3b5db4b28dcbbfdb2ad1e01 diff --git a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum index c7ca1ac..50c2c67 100644 --- a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum +++ b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum @@ -1 +1 @@ -b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 tarballs/mpc-1.0.3.tar.gz +SHA384(tarballs/mpc-1.0.3.tar.gz)= dceeb2566d6145fa771641d22de3bef866fa601fe1fa964bc680a275919080bd12bc1abab4f68cecdbaef71d295b7397 diff --git a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum index 90f90eb..88cd06c 100644 --- a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum +++ b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum @@ -1 +1 @@ -cedc0055d55b6ee4cd17e1e6119ed412520ff81a tarballs/mpfr-3.1.4.tar.xz +SHA384(tarballs/mpfr-3.1.4.tar.xz)= 30a2807378f578544538810b24bb65d44268015e5d2390d8ae6383fe3939b3bba1e85279789400a226b365010de4bbcd diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 3dbd473..144cda1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.keyring$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.,"

1 0

Patch set updated for coreboot: util/crossgcc: Toolchain verified sources
by Philipp Deppenwiese 06 Dec '16

06 Dec '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15170 -gerrit commit bf99bbcb2df86125762f0780fe4256146719d929 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Jun 13 17:01:07 2016 -0700 util/crossgcc: Toolchain verified sources Currently there is no toolchain verification in coreboot. This patchset extends the existing buildgcc script in the following way: Before download or unpack operations the checksum of all used packages are checked against the trustworthy checksums in util/crossgcc/sum. With the option -g checksum can be automatically generated for updated packages as long they support gpg. Only the maintainers can commit checksum changes to the coreboot repository. Some libraries don't offer this possiblity and on update maintainers need to check the sources by themself adding checksums manually! The checksum algorithm changed from sha1 to sha384. If you ask yourself why we don't use sha256 or sha512 for the checksum verification. You should take a look at following wiki article. https://en.wikipedia.org/wiki/Length_extension_attack Change-Id: Id45097fc7e8435fadce4bda75769592af2730b0c Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- util/crossgcc/buildgcc | 246 ++++++++++++++++----- util/crossgcc/gpg.keyring | Bin 0 -> 222182 bytes util/crossgcc/sum/Python-3.5.1.tar.xz.cksum | 2 +- .../sum/acpica-unix2-20160831.tar.gz.cksum | 2 +- util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum | 2 +- .../sum/clang-tools-extra-3.8.0.src.tar.xz.cksum | 2 +- .../sum/compiler-rt-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum | 2 +- util/crossgcc/sum/gdb-7.11.tar.xz.cksum | 2 +- util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum | 2 +- util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum | 2 +- util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/make-4.2.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum | 2 +- util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum | 2 +- util/lint/lint-stable-003-whitespace | 2 +- 18 files changed, 210 insertions(+), 68 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d64b687..297c55e 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -5,6 +5,7 @@ # Stefan Reinauer <stefan.reinauer(a)coresystems.de> # # Copyright (C) 2011 by Sage Electronic Engineering +# Copyright (C) 2016 by Philipp Deppenwiese # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +19,9 @@ cd $(dirname $0) -CROSSGCC_DATE="August 31st, 2016" -CROSSGCC_VERSION="1.43" -CROSSGCC_COMMIT=$( git describe ) +CROSSGCC_DATE="December 07th, 2016" +CROSSGCC_VERSION="1.44" +CROSSGCC_COMMIT=$(git describe) # default settings PACKAGE=GCC @@ -32,6 +33,7 @@ DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 BOOTSTRAP=0 +GENERATE_CHECKSUMS=0 THREADS=1 # GCC toolchain version numbers @@ -50,6 +52,8 @@ EXPAT_VERSION=2.1.1 CLANG_VERSION=3.8.0 MAKE_VERSION=4.2.1 +GPG_KEYRING="$PWD/gpg.keyring" + # GCC toolchain archive locations # These are sanitized by the jenkins toolchain test builder, so if # a completely new URL is added here, it probably needs to be added @@ -100,6 +104,8 @@ red='\033[0;31m' RED='\033[1;31m' green='\033[0;32m' GREEN='\033[1;32m' +yellow='\033[0;33m' +YELLOW='\033[1;33m' blue='\033[0;34m' BLUE='\033[1;34m' cyan='\033[0;36m' @@ -154,6 +160,10 @@ searchtool() -gt 0 ]; then echo $i return + elif [ "$(cat /dev/null | $i version 2>&1 | grep -c "$search")" \ + -gt 0 ]; then + echo $i + return fi fi done @@ -261,60 +271,176 @@ check_cc() { fi } -check_sum() { - test -z "$CHECKSUM" || \ - test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ - "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +verify_signature() { + SIGNATURE_FILE="$1" + SOURCE_FILE="$2" + + if [ -z "${GPG}" ] ; then + printf "\n * ${RED}GPG tool not found. Please install gnupg on your os.${NC}\n" + return 1 + fi + + if [ ! -f "${GPG_KEYRING}" ]; then + printf "\n * ${RED}The gpg keyring can't be found.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SIGNATURE_FILE}" ]; then + printf "\n * ${RED}No signature file found for package: ${SOURCE_FILE} !! PLEASE CHECK MANUALLY WHAT YOU DOWNLOADED, ABORTING CHECKSUM CREATION.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n * ${RED}Source file couldn't be downloaded.${NC}\n" + return 1 + fi + + GPG_OUTPUT=$(${GPG} --no-default-keyring --keyring "${GPG_KEYRING}" --status-fd 1 --verify "tarballs/${SIGNATURE_FILE}" "tarballs/${SOURCE_FILE}" 2>&1) + if [ "$?" = "0" ] ; then + printf "\n * ${GREEN}Signature is good and verified!${NC}" + return 0 + fi + + printf "\n * ${RED}Failed to verify signature of package.${NC}\n" + printf "\n * ${RED}Error: ${GPG_OUTPUT} ${NC}\n" + return 1 } -compute_sum() { - test ! -f sum/$1.cksum && test -f tarballs/$1 && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +calculate_checksum() { + SOURCE_FILE=$1 + + test ! -f sum/"${SOURCE_FILE}".cksum && test -f tarballs/"${SOURCE_FILE}" && \ + ("${OPENSSL}" sha384 tarballs/"${SOURCE_FILE}" > sum/"${SOURCE_FILE}".cksum) && \ + printf "\n * Checksum created. ${CYAN}Note. Please upload sum/${SOURCE_FILE}.cksum if the corresponding archive is upgraded.${NC}" +} + +verify_checksum() { + STATIC_HASH=$(cat sum/$1.cksum) + FILE_HASH=$(${OPENSSL} sha384 tarballs/$1) + + if [ "${STATIC_HASH}" != "${FILE_HASH}" ]; then + printf "\n * ${RED}Failed to verify checksum of package ${1}.${NC}\n" + exit 1 + fi + + printf "\n * ${GREEN}Checksum 0x${FILE_HASH} verified.${NC}\n" +} + +validate_url() { + CHECK_URL=$(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') + if [ "$?" = "0" ] ; then + return 1 + else + return 0 + fi } download_showing_percentage() { - url=$1 - printf " ..${red} 0%%" - wget --no-check-certificate $url 2>&1 | while read line; do - echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' - done - printf "${NC}" + NO_WARNING="$2" + URL=$1 + printf " ..${YELLOW} 0%%${NC}" + + if ! validate_url ${URL}; then + wget ${URL} 2>&1 | while read line; do + printf "${YELLOW}" + echo $line | ${AWK} '/[0-9]\+%/ {printf("\b\b\b\b%4s", $1) }' + printf "${NC}" + done + if [ $? != "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + elif [ "$NO_WARNING" = "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + return 0 } download() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" - FILE=$(basename $archive) - printf " * $FILE " + SOURCE_FILE=$(basename "${archive}") - if test -f tarballs/$FILE && check_sum $FILE ; then + if test -f "tarballs/${SOURCE_FILE}" ; then printf "(cached)" else + rm -f "tarballs/${SOURCE_FILE}"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " printf "(downloading from $archive)" - rm -f tarballs/$FILE - cd tarballs - download_showing_percentage $archive - cd .. - compute_sum $FILE + download_showing_percentage ${archive} 0 + + cd .. || exit 1 fi - if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + if [ ! -f tarballs/${SOURCE_FILE} ]; then + printf "\n${RED} * Failed to download ${SOURCE_FILE}.${NC}\n" exit 1 fi + echo +} + +generate_checksums() { + package="$1" + archive="$(eval echo \$$package"_ARCHIVE")" + SOURCE_FILE=$(basename "${archive}") + SIGNATURE_FILE="dummy" + + rm -f "tarballs/${SOURCE_FILE}"* + rm -f "sum/${SOURCE_FILE}.cksum"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " + printf "(downloading from ${archive})" + download_showing_percentage "${archive}" 0 + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.sig)" + + download_showing_percentage "${archive}.sig" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.sig) + fi + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.asc)" + + download_showing_percentage "${archive}.asc" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.asc) + fi + + cd .. || exit 1 + + verify_signature "${SIGNATURE_FILE}" "${SOURCE_FILE}" + if [ "$?" = "0" ] ; then + calculate_checksum "${SOURCE_FILE}" + verify_checksum "${SOURCE_FILE}" "${archive}" + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n${RED}Failed to download ${SOURCE_FILE}.${NC}\n" + exit 1 + fi + printf "\n" } unpack_and_patch() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" - test -d ${dir} && test -f ${dir}/.unpack_success || ( + FILE=$(basename "$archive") + + verify_checksum "${FILE}" "${archive}" + + test -d "${dir}" && test -f "${dir}/.unpack_success" || ( printf " * $(basename $archive)\n" FLAGS=zxf - suffix=$(echo $archive | sed 's,.*\.,,') + suffix=$(echo "$archive" | sed 's,.*\.,,') if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" elif [ "$suffix" = "gz" ]; then FLAGS=zxf elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" @@ -356,11 +482,11 @@ package_uses_targetarch() generic_build() { - package=$1 - host_target=$2 - builddir=$3 - success=$4 - version=$5 + package="$1" + host_target="$2" + builddir="$3" + success="$4" + version="$5" fn_exists build_$package || return @@ -426,7 +552,7 @@ cleanup() printf "Cleaning up temporary files... " for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package build-$package $(eval echo \$$package"_DIR") + rm -rf "build-${TARGETARCH}-$package" "build-$package" $(eval echo \$$package"_DIR") done rm -f getopt printf "${green}ok${NC}\n" @@ -434,7 +560,7 @@ cleanup() myhelp() { - printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S]\n" + printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S] [-g]\n" printf " $0 [-V|--version]\n" printf " $0 [-h|--help]\n\n" @@ -464,7 +590,9 @@ myhelp() printf "GDB specific options:\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" + printf " [-S|--scripting] build scripting support for GDB\n" + printf " [-g|--generate-checksums] re-generates the checksum for all packages and\n" + printf " verifies them with the help of gpg signatures\n\n" printf "Platforms for GCC & GDB:\n" printf " x86_64 i386-elf i386-mingw32 mipsel-elf riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" @@ -481,6 +609,7 @@ myversion() cat << EOF Copyright (C) 2008-2010 by coresystems GmbH Copyright (C) 2011 by Sage Electronic Engineering +Copyright (C) 2016 by Philipp Deppenwiese This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -749,12 +878,12 @@ getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,generate_checksums,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:gun -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bp:l:P:j:D:tSys:gun $*) getopt_ret=$? set -- $args fi @@ -782,7 +911,8 @@ while true ; do -s|--supported) shift; PRINTSTABLE="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; -n|--nocolor) shift; \ - unset red RED green GREEN blue BLUE cyan CYAN NC;; + unset red RED green GREEN blue BLUE cyan CYAN yellow YELLOW NC;; + -g|--generate-checksums) shift; GENERATE_CHECKSUMS=1;; --) shift; break;; *) break;; esac @@ -848,6 +978,10 @@ case "$PACKAGE" in NAME="GNU Make" PACKAGES=MAKE ;; + ALL|all) + NAME="All packages" + PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC EXPAT PYTHON GDB LLVM CFE CRT CTE IASL MAKE" + ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n"; exit 1 @@ -856,15 +990,14 @@ esac # Find all the required tools: -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -#SHA512SUM=$(searchtool sha512sum) -#MD5SUM=$(searchtool md5sum) -CHECKSUM=$SHA1SUM -LBZIP2=$(searchtool lbzip2 "" nofail) -PIGZ=$(searchtool pigz "" nofail) +TAR=$(searchtool tar "tar") +PATCH=$(searchtool patch "patch") +MAKE=$(searchtool make "Make") +LBZIP2=$(searchtool lbzip2 "bzip2" nofail) +PIGZ=$(searchtool pigz "pigz" nofail) +GPG=$(searchtool gpg "gpg" nofail) +OPENSSL=$(searchtool openssl "openssl") +AWK=$(searchtool awk "Awk") searchtool m4 > /dev/null searchtool bison > /dev/null @@ -946,6 +1079,15 @@ if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi +if [ "$GENERATE_CHECKSUMS" = 1 ]; then + mkdir -p tarballs + for p in $PACKAGES; do + generate_checksums $p + done + + exit 0 +fi + # Prepare target directory for building GCC # (dependencies must be in the PATH) mkdir -p $DESTDIR$TARGETDIR/bin @@ -977,7 +1119,7 @@ printf "Packages built ... ${green}ok${NC}\n" # for reproducibility PROGNAME=$(basename "$0") rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*" -cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT" +cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT" cleanup diff --git a/util/crossgcc/gpg.keyring b/util/crossgcc/gpg.keyring new file mode 100644 index 0000000..8cbce7e Binary files /dev/null and b/util/crossgcc/gpg.keyring differ diff --git a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum index 58affb0..46f43a3 100644 --- a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum +++ b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum @@ -1 +1 @@ -0186da436db76776196612b98bb9c2f76acfe90e tarballs/Python-3.5.1.tar.xz +SHA384(tarballs/Python-3.5.1.tar.xz)= 9aca49d2cde4760035f4fff23e8a446f6451e8effb6e6fab3f259645a631593acb2ce3412aadf810f103f3f6b561abe7 diff --git a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum index d7e538b..6b39768 100644 --- a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum +++ b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum @@ -1 +1 @@ -7e7449f15a195fefd72b65b1671df18e4dccf665 tarballs/acpica-unix2-20160831.tar.gz +SHA384(tarballs/acpica-unix2-20160831.tar.gz)= 171f914bbfc71a69011494cd3484bc87e5ce6b28558699585c8719c250094140357793ead18d2432573a61a1ea5afc6c diff --git a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum index 4bd0bce..b3a7126 100644 --- a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum +++ b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum @@ -1 +1 @@ -624cd377e3a8eef3db83a56ce289a60f556b3ec2 tarballs/binutils-2.26.1.tar.bz2 +SHA384(tarballs/binutils-2.26.1.tar.bz2)= 30cc8be8c230d69b966b80268223b823b3d301c83472317a4b6ff3aa9dd528a31cb1af33640097854e0e34743b1339b7 diff --git a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum index 7ba8c8c..48ccfbf 100644 --- a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce tarballs/cfe-3.8.0.src.tar.xz +SHA384(tarballs/cfe-3.8.0.src.tar.xz)= 3edbe3cafc58ad6fc3d3a133156a656ea7756e8a36176b29bba63434d6f073cef63241cc6df8337fcab3832dd5b5c485 diff --git a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum index e9d8d72..2c4154c 100644 --- a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -a99d8b6fc5e593c4671424b327779318a1856acf tarballs/clang-tools-extra-3.8.0.src.tar.xz +SHA384(tarballs/clang-tools-extra-3.8.0.src.tar.xz)= abd447239f09295f8592225bb7e07ba57cedc3d19a4972b45cd7d70a2db82106d1874a5be03656f8209a0e8a1308fb31 diff --git a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum index 081705d..8637b48 100644 --- a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -480ea09e369dac6de1f3759b27fa19417b26b69e tarballs/compiler-rt-3.8.0.src.tar.xz +SHA384(tarballs/compiler-rt-3.8.0.src.tar.xz)= 4560d512f3c3a0dbcc5c29ab7754b07d91ffa1ddc1c06a5215f3d325bc3f138ebf483e2a37abb10fc36cd125e6bf559e diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum index 882e501..e3a94fa 100644 --- a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum +++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum @@ -1 +1 @@ -ff91419882ac52151050dad0ee8190645fbeee08 tarballs/expat-2.1.1.tar.bz2 +SHA384(tarballs/expat-2.1.1.tar.bz2)= 816e8ca9ac57b6aac76e9979d11714313246492a49c228bb0a16d349174be45cd780d760524eb45acf12ff371e8b96a3 diff --git a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum index bb05e39..073390b 100644 --- a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum +++ b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum @@ -1 +1 @@ -0612270b103941da08376df4d0ef4e5662a2e9eb tarballs/gcc-5.3.0.tar.bz2 +SHA384(tarballs/gcc-5.3.0.tar.bz2)= 4184972f66dc929686c30936cf8f5085829d8584118ebc3e2ec53a40754afbefc351cfd2c211c09dd3b6eb4ab4759820 diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum index ffe5a1c..f3082e7 100644 --- a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum +++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum @@ -1 +1 @@ -466208d771d97d3dfcf965d5c835a669cff8d847 tarballs/gdb-7.11.tar.xz +SHA384(tarballs/gdb-7.11.tar.xz)= 82f89ef35ea1916d5faa67b7fefa2ac3627894d245c43fb4e20828274566cbbb5d7f83899baad77a3cf7fe9fec6f8c7b diff --git a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum index 348b80f..e0ebab2 100644 --- a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum +++ b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum @@ -1 +1 @@ -99d691607613e749aa5d7c0c2a89aeab38fec070 tarballs/gmp-6.1.0.tar.xz +SHA384(tarballs/gmp-6.1.0.tar.xz)= ec69b394cbcf887ab0717473b04bb70ce30102abf24869eca5acb781de405d3a5670fabb776ba68cfe6e117631522d9f diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum index daa27c6..46f991d 100644 --- a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum +++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum @@ -1 +1 @@ -c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz +SHA384(tarballs/libelf-0.8.13.tar.gz)= 07fc0b1a40ba3d2b003899df199d1043bb5d44cf7d913e6460c985582e5275b634edb6af6779255d770010fd7d09580e diff --git a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum index 2f0af53..e407716 100644 --- a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -723ac918979255706434a05f5af34b71c49c9971 tarballs/llvm-3.8.0.src.tar.xz +SHA384(tarballs/llvm-3.8.0.src.tar.xz)= 5d5a012e4d494a4534fcec7643ad28bab7467b96029b6d497e1d523357ae7c9e8bd86400dc90e261d791d6391a369b30 diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum index 34af72c..5c8a69c9 100644 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum @@ -1 +1 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 +SHA384(tarballs/make-4.2.1.tar.bz2)= 07fed67f907c8139cd27d606069ce20f219ccf1d047d2ebb2a2b3242d4332957a64b7ff8c3b5db4b28dcbbfdb2ad1e01 diff --git a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum index c7ca1ac..50c2c67 100644 --- a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum +++ b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum @@ -1 +1 @@ -b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 tarballs/mpc-1.0.3.tar.gz +SHA384(tarballs/mpc-1.0.3.tar.gz)= dceeb2566d6145fa771641d22de3bef866fa601fe1fa964bc680a275919080bd12bc1abab4f68cecdbaef71d295b7397 diff --git a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum index 90f90eb..88cd06c 100644 --- a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum +++ b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum @@ -1 +1 @@ -cedc0055d55b6ee4cd17e1e6119ed412520ff81a tarballs/mpfr-3.1.4.tar.xz +SHA384(tarballs/mpfr-3.1.4.tar.xz)= 30a2807378f578544538810b24bb65d44268015e5d2390d8ae6383fe3939b3bba1e85279789400a226b365010de4bbcd diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 3dbd473..144cda1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.keyring$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.,"

1 0

Patch set updated for coreboot: util/crossgcc: Toolchain verified sources
by Philipp Deppenwiese 06 Dec '16

06 Dec '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15170 -gerrit commit f525d67df8fdce4d3cb306cb2fc1d5cf522dda94 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Jun 13 17:01:07 2016 -0700 util/crossgcc: Toolchain verified sources Currently there is no toolchain verification in coreboot. This patchset extends the existing buildgcc script in the following way: Before download or unpack operations the checksum of all used packages are checked against the trustworthy checksums in util/crossgcc/sum. With the option -g checksum can be automatically generated for updated packages as long they support gpg. Only the maintainers can commit checksum changes to the coreboot repository. Some libraries don't offer this possiblity and on update maintainers need to check the sources by themself adding checksums manually! The checksum algorithm changed from sha1 to sha384. If you ask yourself why we don't use sha256 or sha512 for the checksum verification. You should take a look at following wiki article. https://en.wikipedia.org/wiki/Length_extension_attack Change-Id: Id45097fc7e8435fadce4bda75769592af2730b0c Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- util/crossgcc/buildgcc | 236 +++++++++++++++++---- util/crossgcc/gpg.keyring | Bin 0 -> 222182 bytes util/crossgcc/sum/Python-3.5.1.tar.xz.cksum | 2 +- .../sum/acpica-unix2-20160831.tar.gz.cksum | 2 +- util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum | 2 +- .../sum/clang-tools-extra-3.8.0.src.tar.xz.cksum | 2 +- .../sum/compiler-rt-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum | 2 +- util/crossgcc/sum/gdb-7.11.tar.xz.cksum | 2 +- util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum | 2 +- util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum | 2 +- util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/make-4.2.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum | 2 +- util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum | 2 +- util/lint/lint-stable-003-whitespace | 2 +- 18 files changed, 206 insertions(+), 62 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d64b687..7c9b863 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -5,6 +5,7 @@ # Stefan Reinauer <stefan.reinauer(a)coresystems.de> # # Copyright (C) 2011 by Sage Electronic Engineering +# Copyright (C) 2016 by Philipp Deppenwiese # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +19,9 @@ cd $(dirname $0) -CROSSGCC_DATE="August 31st, 2016" -CROSSGCC_VERSION="1.43" -CROSSGCC_COMMIT=$( git describe ) +CROSSGCC_DATE="December 07th, 2016" +CROSSGCC_VERSION="1.44" +CROSSGCC_COMMIT=$(git describe) # default settings PACKAGE=GCC @@ -32,6 +33,7 @@ DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 BOOTSTRAP=0 +GENERATE_CHECKSUMS=0 THREADS=1 # GCC toolchain version numbers @@ -50,6 +52,8 @@ EXPAT_VERSION=2.1.1 CLANG_VERSION=3.8.0 MAKE_VERSION=4.2.1 +GPG_KEYRING="$PWD/gpg.keyring" + # GCC toolchain archive locations # These are sanitized by the jenkins toolchain test builder, so if # a completely new URL is added here, it probably needs to be added @@ -100,6 +104,8 @@ red='\033[0;31m' RED='\033[1;31m' green='\033[0;32m' GREEN='\033[1;32m' +yellow='\033[0;33m' +YELLOW='\033[1;33m' blue='\033[0;34m' BLUE='\033[1;34m' cyan='\033[0;36m' @@ -154,6 +160,10 @@ searchtool() -gt 0 ]; then echo $i return + elif [ "$(cat /dev/null | $i version 2>&1 | grep -c "$search")" \ + -gt 0 ]; then + echo $i + return fi fi done @@ -261,60 +271,178 @@ check_cc() { fi } -check_sum() { - test -z "$CHECKSUM" || \ - test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ - "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +verify_signature() { + SIGNATURE_FILE="$1" + SOURCE_FILE="$2" + + if [ -z "${GPG}" ] ; then + printf "\n * ${RED}GPG tool not found. Please install gnupg on your os.${NC}\n" + return 1 + fi + + if [ ! -f "${GPG_KEYRING}" ]; then + printf "\n * ${RED}The gpg keyring can't be found.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SIGNATURE_FILE}" ]; then + printf "\n * ${RED}No signature file found for package: ${SOURCE_FILE} !! PLEASE CHECK MANUALLY WHAT YOU DOWNLOADED, ABORTING CHECKSUM CREATION.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n * ${RED}Source file couldn't be downloaded.${NC}\n" + return 1 + fi + + GPG_OUTPUT=$(${GPG} --no-default-keyring --keyring "${GPG_KEYRING}" --status-fd 1 --verify "tarballs/${SIGNATURE_FILE}" "tarballs/${SOURCE_FILE}" 2>&1) + if [ "$?" = "0" ] ; then + printf "\n * ${GREEN}Signature is good and verified!${NC}" + return 0 + fi + + printf "\n * ${RED}Failed to verify signature of package.${NC}\n" + printf "\n * ${RED}Error: ${GPG_OUTPUT} ${NC}\n" + return 1 +} + +calculate_checksum() { + SOURCE_FILE=$1 + + test ! -f sum/"${SOURCE_FILE}".cksum && test -f tarballs/"${SOURCE_FILE}" && \ + ("${OPENSSL}" sha384 tarballs/"${SOURCE_FILE}" > sum/"${SOURCE_FILE}".cksum) && \ + printf "\n * Checksum created. ${CYAN}Note. Please upload sum/${SOURCE_FILE}.cksum if the corresponding archive is upgraded.${NC}" +} + +verify_checksum() { + STATIC_HASH=$(cat sum/$1.cksum) + FILE_HASH=$(${OPENSSL} sha384 tarballs/$1) + + if [ "${STATIC_HASH}" != "${FILE_HASH}" ]; then + printf "\n * ${RED}Failed to verify checksum of package ${1}.${NC}\n" + exit 1 + fi + + printf "\n * ${GREEN}Checksum 0x${FILE_HASH} verified.${NC}\n" } -compute_sum() { - test ! -f sum/$1.cksum && test -f tarballs/$1 && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +validate_url() { + CHECK_URL=$(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') + if [ "$?" = "0" ] ; then + return 1 + else + return 0 + fi } download_showing_percentage() { - url=$1 - printf " ..${red} 0%%" - wget --no-check-certificate $url 2>&1 | while read line; do - echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' - done - printf "${NC}" + NO_WARNING="$2" + URL=$1 + printf " ..${YELLOW} 0%%${NC}" + + if ! validate_url ${URL}; then + wget ${URL} 2>&1 | while read line; do + printf "${YELLOW}" + echo $line | ${AWK} '/[0-9]\+%/ {printf("\b\b\b\b%4s", $1) }' + printf "${NC}" + done + if [ $? != "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + elif [ "$NO_WARNING" = "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + + return 0 } download() { package=$1 archive="$(eval echo \$$package"_ARCHIVE")" - FILE=$(basename $archive) - printf " * $FILE " + SOURCE_FILE=$(basename "${archive}") - if test -f tarballs/$FILE && check_sum $FILE ; then + if test -f "tarballs/${SOURCE_FILE}" ; then printf "(cached)" else + rm -f "tarballs/${SOURCE_FILE}"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " printf "(downloading from $archive)" - rm -f tarballs/$FILE - cd tarballs - download_showing_percentage $archive - cd .. - compute_sum $FILE + download_showing_percentage ${archive} 0 + + cd .. || exit 1 fi - if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + if [ ! -f tarballs/${SOURCE_FILE} ]; then + printf "\n${RED} * Failed to download ${SOURCE_FILE}.${NC}\n" exit 1 fi + + echo "" +} + +generate_checksums() { + package=$1 + archive="$(eval echo \$$package"_ARCHIVE")" + SOURCE_FILE=$(basename "${archive}") + SIGNATURE_FILE="dummy" + + rm -f "tarballs/${SOURCE_FILE}"* + rm -f "sum/${SOURCE_FILE}.cksum"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " + printf "(downloading from ${archive})" + download_showing_percentage "${archive}" 0 + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.sig)" + + download_showing_percentage "${archive}.sig" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.sig) + fi + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.asc)" + + download_showing_percentage "${archive}.asc" 0 + if [ "$?" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.asc) + fi + + cd .. || exit 1 + + verify_signature "${SIGNATURE_FILE}" "${SOURCE_FILE}" + if [ "$?" = "0" ] ; then + calculate_checksum "${SOURCE_FILE}" + verify_checksum "${SOURCE_FILE}" "${archive}" + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n${RED}Failed to download ${SOURCE_FILE}.${NC}\n" + exit 1 + fi + printf "\n" } unpack_and_patch() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" - test -d ${dir} && test -f ${dir}/.unpack_success || ( + FILE=$(basename "$archive") + + verify_checksum "${FILE}" "${archive}" + + test -d "${dir}" && test -f "${dir}/.unpack_success" || ( printf " * $(basename $archive)\n" FLAGS=zxf - suffix=$(echo $archive | sed 's,.*\.,,') + suffix=$(echo "$archive" | sed 's,.*\.,,') if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" elif [ "$suffix" = "gz" ]; then FLAGS=zxf elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" @@ -426,7 +554,7 @@ cleanup() printf "Cleaning up temporary files... " for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package build-$package $(eval echo \$$package"_DIR") + rm -rf "build-${TARGETARCH}-$package" "build-$package" $(eval echo \$$package"_DIR") done rm -f getopt printf "${green}ok${NC}\n" @@ -434,7 +562,7 @@ cleanup() myhelp() { - printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S]\n" + printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S] [-g]\n" printf " $0 [-V|--version]\n" printf " $0 [-h|--help]\n\n" @@ -464,7 +592,9 @@ myhelp() printf "GDB specific options:\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" + printf " [-S|--scripting] build scripting support for GDB\n" + printf " [-g|--generate-checksums] re-generates the checksum for all packages and\n" + printf " verifies them with the help of gpg signatures\n\n" printf "Platforms for GCC & GDB:\n" printf " x86_64 i386-elf i386-mingw32 mipsel-elf riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" @@ -481,6 +611,7 @@ myversion() cat << EOF Copyright (C) 2008-2010 by coresystems GmbH Copyright (C) 2011 by Sage Electronic Engineering +Copyright (C) 2016 by Philipp Deppenwiese This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -749,12 +880,12 @@ getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,generate_checksums,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:gun -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bp:l:P:j:D:tSys:gun $*) getopt_ret=$? set -- $args fi @@ -782,7 +913,8 @@ while true ; do -s|--supported) shift; PRINTSTABLE="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; -n|--nocolor) shift; \ - unset red RED green GREEN blue BLUE cyan CYAN NC;; + unset red RED green GREEN blue BLUE cyan CYAN yellow YELLOW NC;; + -g|--generate-checksums) shift; GENERATE_CHECKSUMS=1;; --) shift; break;; *) break;; esac @@ -848,6 +980,10 @@ case "$PACKAGE" in NAME="GNU Make" PACKAGES=MAKE ;; + ALL|all) + NAME="All packages" + PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC EXPAT PYTHON GDB LLVM CFE CRT CTE IASL MAKE" + ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n"; exit 1 @@ -856,15 +992,14 @@ esac # Find all the required tools: -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -#SHA512SUM=$(searchtool sha512sum) -#MD5SUM=$(searchtool md5sum) -CHECKSUM=$SHA1SUM -LBZIP2=$(searchtool lbzip2 "" nofail) -PIGZ=$(searchtool pigz "" nofail) +TAR=$(searchtool tar "tar") +PATCH=$(searchtool patch "patch") +MAKE=$(searchtool make "Make") +LBZIP2=$(searchtool lbzip2 "bzip2" nofail) +PIGZ=$(searchtool pigz "pigz" nofail) +GPG=$(searchtool gpg "gpg" nofail) +OPENSSL=$(searchtool openssl "openssl") +AWK=$(searchtool awk "Awk") searchtool m4 > /dev/null searchtool bison > /dev/null @@ -946,6 +1081,15 @@ if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi +if [ "$GENERATE_CHECKSUMS" = 1 ]; then + mkdir -p tarballs + for p in $PACKAGES; do + generate_checksums $p + done + + exit 0 +fi + # Prepare target directory for building GCC # (dependencies must be in the PATH) mkdir -p $DESTDIR$TARGETDIR/bin @@ -977,7 +1121,7 @@ printf "Packages built ... ${green}ok${NC}\n" # for reproducibility PROGNAME=$(basename "$0") rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*" -cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT" +cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT" cleanup diff --git a/util/crossgcc/gpg.keyring b/util/crossgcc/gpg.keyring new file mode 100644 index 0000000..8cbce7e Binary files /dev/null and b/util/crossgcc/gpg.keyring differ diff --git a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum index 58affb0..46f43a3 100644 --- a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum +++ b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum @@ -1 +1 @@ -0186da436db76776196612b98bb9c2f76acfe90e tarballs/Python-3.5.1.tar.xz +SHA384(tarballs/Python-3.5.1.tar.xz)= 9aca49d2cde4760035f4fff23e8a446f6451e8effb6e6fab3f259645a631593acb2ce3412aadf810f103f3f6b561abe7 diff --git a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum index d7e538b..6b39768 100644 --- a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum +++ b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum @@ -1 +1 @@ -7e7449f15a195fefd72b65b1671df18e4dccf665 tarballs/acpica-unix2-20160831.tar.gz +SHA384(tarballs/acpica-unix2-20160831.tar.gz)= 171f914bbfc71a69011494cd3484bc87e5ce6b28558699585c8719c250094140357793ead18d2432573a61a1ea5afc6c diff --git a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum index 4bd0bce..b3a7126 100644 --- a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum +++ b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum @@ -1 +1 @@ -624cd377e3a8eef3db83a56ce289a60f556b3ec2 tarballs/binutils-2.26.1.tar.bz2 +SHA384(tarballs/binutils-2.26.1.tar.bz2)= 30cc8be8c230d69b966b80268223b823b3d301c83472317a4b6ff3aa9dd528a31cb1af33640097854e0e34743b1339b7 diff --git a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum index 7ba8c8c..48ccfbf 100644 --- a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce tarballs/cfe-3.8.0.src.tar.xz +SHA384(tarballs/cfe-3.8.0.src.tar.xz)= 3edbe3cafc58ad6fc3d3a133156a656ea7756e8a36176b29bba63434d6f073cef63241cc6df8337fcab3832dd5b5c485 diff --git a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum index e9d8d72..2c4154c 100644 --- a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -a99d8b6fc5e593c4671424b327779318a1856acf tarballs/clang-tools-extra-3.8.0.src.tar.xz +SHA384(tarballs/clang-tools-extra-3.8.0.src.tar.xz)= abd447239f09295f8592225bb7e07ba57cedc3d19a4972b45cd7d70a2db82106d1874a5be03656f8209a0e8a1308fb31 diff --git a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum index 081705d..8637b48 100644 --- a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -480ea09e369dac6de1f3759b27fa19417b26b69e tarballs/compiler-rt-3.8.0.src.tar.xz +SHA384(tarballs/compiler-rt-3.8.0.src.tar.xz)= 4560d512f3c3a0dbcc5c29ab7754b07d91ffa1ddc1c06a5215f3d325bc3f138ebf483e2a37abb10fc36cd125e6bf559e diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum index 882e501..e3a94fa 100644 --- a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum +++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum @@ -1 +1 @@ -ff91419882ac52151050dad0ee8190645fbeee08 tarballs/expat-2.1.1.tar.bz2 +SHA384(tarballs/expat-2.1.1.tar.bz2)= 816e8ca9ac57b6aac76e9979d11714313246492a49c228bb0a16d349174be45cd780d760524eb45acf12ff371e8b96a3 diff --git a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum index bb05e39..073390b 100644 --- a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum +++ b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum @@ -1 +1 @@ -0612270b103941da08376df4d0ef4e5662a2e9eb tarballs/gcc-5.3.0.tar.bz2 +SHA384(tarballs/gcc-5.3.0.tar.bz2)= 4184972f66dc929686c30936cf8f5085829d8584118ebc3e2ec53a40754afbefc351cfd2c211c09dd3b6eb4ab4759820 diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum index ffe5a1c..f3082e7 100644 --- a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum +++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum @@ -1 +1 @@ -466208d771d97d3dfcf965d5c835a669cff8d847 tarballs/gdb-7.11.tar.xz +SHA384(tarballs/gdb-7.11.tar.xz)= 82f89ef35ea1916d5faa67b7fefa2ac3627894d245c43fb4e20828274566cbbb5d7f83899baad77a3cf7fe9fec6f8c7b diff --git a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum index 348b80f..e0ebab2 100644 --- a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum +++ b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum @@ -1 +1 @@ -99d691607613e749aa5d7c0c2a89aeab38fec070 tarballs/gmp-6.1.0.tar.xz +SHA384(tarballs/gmp-6.1.0.tar.xz)= ec69b394cbcf887ab0717473b04bb70ce30102abf24869eca5acb781de405d3a5670fabb776ba68cfe6e117631522d9f diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum index daa27c6..46f991d 100644 --- a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum +++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum @@ -1 +1 @@ -c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz +SHA384(tarballs/libelf-0.8.13.tar.gz)= 07fc0b1a40ba3d2b003899df199d1043bb5d44cf7d913e6460c985582e5275b634edb6af6779255d770010fd7d09580e diff --git a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum index 2f0af53..e407716 100644 --- a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -723ac918979255706434a05f5af34b71c49c9971 tarballs/llvm-3.8.0.src.tar.xz +SHA384(tarballs/llvm-3.8.0.src.tar.xz)= 5d5a012e4d494a4534fcec7643ad28bab7467b96029b6d497e1d523357ae7c9e8bd86400dc90e261d791d6391a369b30 diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum index 34af72c..5c8a69c9 100644 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum @@ -1 +1 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 +SHA384(tarballs/make-4.2.1.tar.bz2)= 07fed67f907c8139cd27d606069ce20f219ccf1d047d2ebb2a2b3242d4332957a64b7ff8c3b5db4b28dcbbfdb2ad1e01 diff --git a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum index c7ca1ac..50c2c67 100644 --- a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum +++ b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum @@ -1 +1 @@ -b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 tarballs/mpc-1.0.3.tar.gz +SHA384(tarballs/mpc-1.0.3.tar.gz)= dceeb2566d6145fa771641d22de3bef866fa601fe1fa964bc680a275919080bd12bc1abab4f68cecdbaef71d295b7397 diff --git a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum index 90f90eb..88cd06c 100644 --- a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum +++ b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum @@ -1 +1 @@ -cedc0055d55b6ee4cd17e1e6119ed412520ff81a tarballs/mpfr-3.1.4.tar.xz +SHA384(tarballs/mpfr-3.1.4.tar.xz)= 30a2807378f578544538810b24bb65d44268015e5d2390d8ae6383fe3939b3bba1e85279789400a226b365010de4bbcd diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 3dbd473..144cda1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.keyring$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.,"

1 0

Patch set updated for coreboot: util/crossgcc: Toolchain verified sources
by Philipp Deppenwiese 06 Dec '16

06 Dec '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15170 -gerrit commit ceadada2020b2e381605f8bb8f45f9bb839c2952 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Jun 13 17:01:07 2016 -0700 util/crossgcc: Toolchain verified sources Currently there is no toolchain verification in coreboot. This patchset extends the existing buildgcc script in the following way: Before download or unpack operations the checksum of all used packages are checked against the trustworthy checksums in util/crossgcc/sum. With the option -g checksum can be automatically generated for updated packages as long they support gpg. Only the maintainers can commit checksum changes to the coreboot repository. Some libraries don't offer this possiblity and on update maintainers need to check the sources by themself adding checksums manually! The checksum algorithm changed from sha1 to sha384. If you ask yourself why we don't use sha256 or sha512 for the checksum verification. You should take a look at following wiki article. https://en.wikipedia.org/wiki/Length_extension_attack Change-Id: Id45097fc7e8435fadce4bda75769592af2730b0c Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- util/crossgcc/buildgcc | 236 +++++++++++++++++---- util/crossgcc/gpg.keyring | Bin 0 -> 222182 bytes util/crossgcc/sum/Python-3.5.1.tar.xz.cksum | 2 +- .../sum/acpica-unix2-20160831.tar.gz.cksum | 2 +- util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum | 2 +- .../sum/clang-tools-extra-3.8.0.src.tar.xz.cksum | 2 +- .../sum/compiler-rt-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum | 2 +- util/crossgcc/sum/gdb-7.11.tar.xz.cksum | 2 +- util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum | 2 +- util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum | 2 +- util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/make-4.2.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum | 2 +- util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum | 2 +- util/lint/lint-stable-003-whitespace | 2 +- 18 files changed, 206 insertions(+), 62 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d64b687..b6b1d6e 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -5,6 +5,7 @@ # Stefan Reinauer <stefan.reinauer(a)coresystems.de> # # Copyright (C) 2011 by Sage Electronic Engineering +# Copyright (C) 2016 by Philipp Deppenwiese # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +19,9 @@ cd $(dirname $0) -CROSSGCC_DATE="August 31st, 2016" -CROSSGCC_VERSION="1.43" -CROSSGCC_COMMIT=$( git describe ) +CROSSGCC_DATE="December 07th, 2016" +CROSSGCC_VERSION="1.44" +CROSSGCC_COMMIT=$(git describe) # default settings PACKAGE=GCC @@ -32,6 +33,7 @@ DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 BOOTSTRAP=0 +GENERATE_CHECKSUMS=0 THREADS=1 # GCC toolchain version numbers @@ -50,6 +52,8 @@ EXPAT_VERSION=2.1.1 CLANG_VERSION=3.8.0 MAKE_VERSION=4.2.1 +GPG_KEYRING="$PWD/gpg.keyring" + # GCC toolchain archive locations # These are sanitized by the jenkins toolchain test builder, so if # a completely new URL is added here, it probably needs to be added @@ -100,6 +104,8 @@ red='\033[0;31m' RED='\033[1;31m' green='\033[0;32m' GREEN='\033[1;32m' +yellow='\033[0;33m' +YELLOW='\033[1;33m' blue='\033[0;34m' BLUE='\033[1;34m' cyan='\033[0;36m' @@ -154,6 +160,10 @@ searchtool() -gt 0 ]; then echo $i return + elif [ "$(cat /dev/null | $i version 2>&1 | grep -c "$search")" \ + -gt 0 ]; then + echo $i + return fi fi done @@ -261,60 +271,178 @@ check_cc() { fi } -check_sum() { - test -z "$CHECKSUM" || \ - test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ - "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +verify_signature() { + SIGNATURE_FILE="$1" + SOURCE_FILE="$2" + + if [ -z "${GPG}" ] ; then + printf "\n * ${RED}GPG tool not found. Please install gnupg on your os.${NC}\n" + return 1 + fi + + if [ ! -f "${GPG_KEYRING}" ]; then + printf "\n * ${RED}The gpg keyring can't be found.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SIGNATURE_FILE}" ]; then + printf "\n * ${RED}No signature file found for package: ${SOURCE_FILE} !! PLEASE CHECK MANUALLY WHAT YOU DOWNLOADED, ABORTING CHECKSUM CREATION.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n * ${RED}Source file couldn't be downloaded.${NC}\n" + return 1 + fi + + GPG_OUTPUT=$(${GPG} --no-default-keyring --keyring "${GPG_KEYRING}" --status-fd 1 --verify "tarballs/${SIGNATURE_FILE}" "tarballs/${SOURCE_FILE}" 2>&1) + if [ "${?}" = "0" ] ; then + printf "\n * ${GREEN}Signature is good and verified!${NC}" + return 0 + fi + + printf "\n * ${RED}Failed to verify signature of package.${NC}\n" + printf "\n * ${RED}Error: ${GPG_OUTPUT} ${NC}\n" + return 1 +} + +calculate_checksum() { + SOURCE_FILE=$1 + + test ! -f sum/"${SOURCE_FILE}".cksum && test -f tarballs/"${SOURCE_FILE}" && \ + ("${OPENSSL}" sha384 tarballs/"${SOURCE_FILE}" > sum/"${SOURCE_FILE}".cksum) && \ + printf "\n * Checksum created. ${CYAN}Note. Please upload sum/${SOURCE_FILE}.cksum if the corresponding archive is upgraded.${NC}" +} + +verify_checksum() { + STATIC_HASH=$(cat sum/$1.cksum) + FILE_HASH=$(${OPENSSL} sha384 tarballs/$1) + + if [ "${STATIC_HASH}" != "${FILE_HASH}" ]; then + printf "\n * ${RED}Failed to verify checksum of package ${1}.${NC}\n" + exit 1 + fi + + printf "\n * ${GREEN}Checksum 0x${FILE_HASH} verified.${NC}\n" } -compute_sum() { - test ! -f sum/$1.cksum && test -f tarballs/$1 && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +validate_url() { + CHECK_URL=$(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') + if [ "$?" = "0" ] ; then + return 1 + else + return 0 + fi } download_showing_percentage() { - url=$1 - printf " ..${red} 0%%" - wget --no-check-certificate $url 2>&1 | while read line; do - echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' - done - printf "${NC}" + NO_WARNING="$2" + URL=$1 + printf " ..${YELLOW} 0%%${NC}" + + if ! validate_url ${URL}; then + wget ${URL} 2>&1 | while read line; do + printf "${YELLOW}" + echo $line | ${AWK} '/[0-9]\+%/ {printf("\b\b\b\b%4s", $1) }' + printf "${NC}" + done + if [ ${?} != "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + elif [ "$NO_WARNING" = "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + + return 0 } download() { package=$1 archive="$(eval echo \$$package"_ARCHIVE")" - FILE=$(basename $archive) - printf " * $FILE " + SOURCE_FILE=$(basename "${archive}") - if test -f tarballs/$FILE && check_sum $FILE ; then + if test -f "tarballs/${SOURCE_FILE}" ; then printf "(cached)" else + rm -f "tarballs/${SOURCE_FILE}"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " printf "(downloading from $archive)" - rm -f tarballs/$FILE - cd tarballs - download_showing_percentage $archive - cd .. - compute_sum $FILE + download_showing_percentage ${archive} 0 + + cd .. || exit 1 fi - if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + if [ ! -f tarballs/${SOURCE_FILE} ]; then + printf "\n${RED} * Failed to download ${SOURCE_FILE}.${NC}\n" exit 1 fi + + echo "" +} + +generate_checksums() { + package=$1 + archive="$(eval echo \$$package"_ARCHIVE")" + SOURCE_FILE=$(basename "${archive}") + SIGNATURE_FILE="dummy" + + rm -f "tarballs/${SOURCE_FILE}"* + rm -f "sum/${SOURCE_FILE}.cksum"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " + printf "(downloading from ${archive})" + download_showing_percentage "${archive}" 0 + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.sig)" + + download_showing_percentage "${archive}.sig" 0 + if [ "${?}" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.sig) + fi + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.asc)" + + download_showing_percentage "${archive}.asc" 0 + if [ "${?}" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.asc) + fi + + cd .. || exit 1 + + verify_signature "${SIGNATURE_FILE}" "${SOURCE_FILE}" + if [ "${?}" = "0" ] ; then + calculate_checksum "${SOURCE_FILE}" + verify_checksum "${SOURCE_FILE}" "${archive}" + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n${RED}Failed to download ${SOURCE_FILE}.${NC}\n" + exit 1 + fi + printf "\n" } unpack_and_patch() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" - test -d ${dir} && test -f ${dir}/.unpack_success || ( + FILE=$(basename "$archive") + + verify_checksum "${FILE}" "${archive}" + + test -d "${dir}" && test -f "${dir}/.unpack_success" || ( printf " * $(basename $archive)\n" FLAGS=zxf - suffix=$(echo $archive | sed 's,.*\.,,') + suffix=$(echo "$archive" | sed 's,.*\.,,') if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" elif [ "$suffix" = "gz" ]; then FLAGS=zxf elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" @@ -426,7 +554,7 @@ cleanup() printf "Cleaning up temporary files... " for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package build-$package $(eval echo \$$package"_DIR") + rm -rf "build-${TARGETARCH}-$package" "build-$package" $(eval echo \$$package"_DIR") done rm -f getopt printf "${green}ok${NC}\n" @@ -434,7 +562,7 @@ cleanup() myhelp() { - printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S]\n" + printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S] [-g]\n" printf " $0 [-V|--version]\n" printf " $0 [-h|--help]\n\n" @@ -464,7 +592,9 @@ myhelp() printf "GDB specific options:\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" + printf " [-S|--scripting] build scripting support for GDB\n" + printf " [-g|--generate-checksums] re-generates the checksum for all packages and\n" + printf " verifies them with the help of gpg signatures\n\n" printf "Platforms for GCC & GDB:\n" printf " x86_64 i386-elf i386-mingw32 mipsel-elf riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" @@ -481,6 +611,7 @@ myversion() cat << EOF Copyright (C) 2008-2010 by coresystems GmbH Copyright (C) 2011 by Sage Electronic Engineering +Copyright (C) 2016 by Philipp Deppenwiese This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -749,12 +880,12 @@ getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,generate_checksums,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:gun -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bp:l:P:j:D:tSys:gun $*) getopt_ret=$? set -- $args fi @@ -782,7 +913,8 @@ while true ; do -s|--supported) shift; PRINTSTABLE="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; -n|--nocolor) shift; \ - unset red RED green GREEN blue BLUE cyan CYAN NC;; + unset red RED green GREEN blue BLUE cyan CYAN yellow YELLOW NC;; + -g|--generate-checksums) shift; GENERATE_CHECKSUMS=1;; --) shift; break;; *) break;; esac @@ -848,6 +980,10 @@ case "$PACKAGE" in NAME="GNU Make" PACKAGES=MAKE ;; + ALL|all) + NAME="All packages" + PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC EXPAT PYTHON GDB LLVM CFE CRT CTE IASL MAKE" + ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n"; exit 1 @@ -856,15 +992,14 @@ esac # Find all the required tools: -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -#SHA512SUM=$(searchtool sha512sum) -#MD5SUM=$(searchtool md5sum) -CHECKSUM=$SHA1SUM -LBZIP2=$(searchtool lbzip2 "" nofail) -PIGZ=$(searchtool pigz "" nofail) +TAR=$(searchtool tar "tar") +PATCH=$(searchtool patch "patch") +MAKE=$(searchtool make "Make") +LBZIP2=$(searchtool lbzip2 "bzip2" nofail) +PIGZ=$(searchtool pigz "pigz" nofail) +GPG=$(searchtool gpg "gpg" nofail) +OPENSSL=$(searchtool openssl "openssl") +AWK=$(searchtool awk "Awk") searchtool m4 > /dev/null searchtool bison > /dev/null @@ -946,6 +1081,15 @@ if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi +if [ "$GENERATE_CHECKSUMS" = 1 ]; then + mkdir -p tarballs + for p in $PACKAGES; do + generate_checksums $p + done + + exit 0 +fi + # Prepare target directory for building GCC # (dependencies must be in the PATH) mkdir -p $DESTDIR$TARGETDIR/bin @@ -977,7 +1121,7 @@ printf "Packages built ... ${green}ok${NC}\n" # for reproducibility PROGNAME=$(basename "$0") rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*" -cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT" +cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT" cleanup diff --git a/util/crossgcc/gpg.keyring b/util/crossgcc/gpg.keyring new file mode 100644 index 0000000..8cbce7e Binary files /dev/null and b/util/crossgcc/gpg.keyring differ diff --git a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum index 58affb0..46f43a3 100644 --- a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum +++ b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum @@ -1 +1 @@ -0186da436db76776196612b98bb9c2f76acfe90e tarballs/Python-3.5.1.tar.xz +SHA384(tarballs/Python-3.5.1.tar.xz)= 9aca49d2cde4760035f4fff23e8a446f6451e8effb6e6fab3f259645a631593acb2ce3412aadf810f103f3f6b561abe7 diff --git a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum index d7e538b..6b39768 100644 --- a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum +++ b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum @@ -1 +1 @@ -7e7449f15a195fefd72b65b1671df18e4dccf665 tarballs/acpica-unix2-20160831.tar.gz +SHA384(tarballs/acpica-unix2-20160831.tar.gz)= 171f914bbfc71a69011494cd3484bc87e5ce6b28558699585c8719c250094140357793ead18d2432573a61a1ea5afc6c diff --git a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum index 4bd0bce..b3a7126 100644 --- a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum +++ b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum @@ -1 +1 @@ -624cd377e3a8eef3db83a56ce289a60f556b3ec2 tarballs/binutils-2.26.1.tar.bz2 +SHA384(tarballs/binutils-2.26.1.tar.bz2)= 30cc8be8c230d69b966b80268223b823b3d301c83472317a4b6ff3aa9dd528a31cb1af33640097854e0e34743b1339b7 diff --git a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum index 7ba8c8c..48ccfbf 100644 --- a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce tarballs/cfe-3.8.0.src.tar.xz +SHA384(tarballs/cfe-3.8.0.src.tar.xz)= 3edbe3cafc58ad6fc3d3a133156a656ea7756e8a36176b29bba63434d6f073cef63241cc6df8337fcab3832dd5b5c485 diff --git a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum index e9d8d72..2c4154c 100644 --- a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -a99d8b6fc5e593c4671424b327779318a1856acf tarballs/clang-tools-extra-3.8.0.src.tar.xz +SHA384(tarballs/clang-tools-extra-3.8.0.src.tar.xz)= abd447239f09295f8592225bb7e07ba57cedc3d19a4972b45cd7d70a2db82106d1874a5be03656f8209a0e8a1308fb31 diff --git a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum index 081705d..8637b48 100644 --- a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -480ea09e369dac6de1f3759b27fa19417b26b69e tarballs/compiler-rt-3.8.0.src.tar.xz +SHA384(tarballs/compiler-rt-3.8.0.src.tar.xz)= 4560d512f3c3a0dbcc5c29ab7754b07d91ffa1ddc1c06a5215f3d325bc3f138ebf483e2a37abb10fc36cd125e6bf559e diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum index 882e501..e3a94fa 100644 --- a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum +++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum @@ -1 +1 @@ -ff91419882ac52151050dad0ee8190645fbeee08 tarballs/expat-2.1.1.tar.bz2 +SHA384(tarballs/expat-2.1.1.tar.bz2)= 816e8ca9ac57b6aac76e9979d11714313246492a49c228bb0a16d349174be45cd780d760524eb45acf12ff371e8b96a3 diff --git a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum index bb05e39..073390b 100644 --- a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum +++ b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum @@ -1 +1 @@ -0612270b103941da08376df4d0ef4e5662a2e9eb tarballs/gcc-5.3.0.tar.bz2 +SHA384(tarballs/gcc-5.3.0.tar.bz2)= 4184972f66dc929686c30936cf8f5085829d8584118ebc3e2ec53a40754afbefc351cfd2c211c09dd3b6eb4ab4759820 diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum index ffe5a1c..f3082e7 100644 --- a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum +++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum @@ -1 +1 @@ -466208d771d97d3dfcf965d5c835a669cff8d847 tarballs/gdb-7.11.tar.xz +SHA384(tarballs/gdb-7.11.tar.xz)= 82f89ef35ea1916d5faa67b7fefa2ac3627894d245c43fb4e20828274566cbbb5d7f83899baad77a3cf7fe9fec6f8c7b diff --git a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum index 348b80f..e0ebab2 100644 --- a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum +++ b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum @@ -1 +1 @@ -99d691607613e749aa5d7c0c2a89aeab38fec070 tarballs/gmp-6.1.0.tar.xz +SHA384(tarballs/gmp-6.1.0.tar.xz)= ec69b394cbcf887ab0717473b04bb70ce30102abf24869eca5acb781de405d3a5670fabb776ba68cfe6e117631522d9f diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum index daa27c6..46f991d 100644 --- a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum +++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum @@ -1 +1 @@ -c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz +SHA384(tarballs/libelf-0.8.13.tar.gz)= 07fc0b1a40ba3d2b003899df199d1043bb5d44cf7d913e6460c985582e5275b634edb6af6779255d770010fd7d09580e diff --git a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum index 2f0af53..e407716 100644 --- a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -723ac918979255706434a05f5af34b71c49c9971 tarballs/llvm-3.8.0.src.tar.xz +SHA384(tarballs/llvm-3.8.0.src.tar.xz)= 5d5a012e4d494a4534fcec7643ad28bab7467b96029b6d497e1d523357ae7c9e8bd86400dc90e261d791d6391a369b30 diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum index 34af72c..5c8a69c9 100644 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum @@ -1 +1 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 +SHA384(tarballs/make-4.2.1.tar.bz2)= 07fed67f907c8139cd27d606069ce20f219ccf1d047d2ebb2a2b3242d4332957a64b7ff8c3b5db4b28dcbbfdb2ad1e01 diff --git a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum index c7ca1ac..50c2c67 100644 --- a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum +++ b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum @@ -1 +1 @@ -b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 tarballs/mpc-1.0.3.tar.gz +SHA384(tarballs/mpc-1.0.3.tar.gz)= dceeb2566d6145fa771641d22de3bef866fa601fe1fa964bc680a275919080bd12bc1abab4f68cecdbaef71d295b7397 diff --git a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum index 90f90eb..88cd06c 100644 --- a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum +++ b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum @@ -1 +1 @@ -cedc0055d55b6ee4cd17e1e6119ed412520ff81a tarballs/mpfr-3.1.4.tar.xz +SHA384(tarballs/mpfr-3.1.4.tar.xz)= 30a2807378f578544538810b24bb65d44268015e5d2390d8ae6383fe3939b3bba1e85279789400a226b365010de4bbcd diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 3dbd473..144cda1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.keyring$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.,"

1 0

Patch set updated for coreboot: util/crossgcc: Toolchain verified sources
by Philipp Deppenwiese 06 Dec '16

06 Dec '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15170 -gerrit commit ee167883d201a9eea8cbd433e8841c12a14a132e Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Jun 13 17:01:07 2016 -0700 util/crossgcc: Toolchain verified sources Currently there is no toolchain verification in coreboot. This patchset extends the existing buildgcc script in the following way: Before download or unpack operations the checksum of all used packages are checked against the trustworthy checksums in util/crossgcc/sum. With the option -g checksum can be automatically generated for updated packages as long they support gpg. Only the maintainers can commit checksum changes to the coreboot repository. Some libraries don't offer this possiblity and on update maintainers need to check the sources by themself adding checksums manually! The checksum algorithm changed from sha1 to sha384. If you ask yourself why we don't use sha256 or sha512 for the checksum verification. You should take a look at following wiki article. https://en.wikipedia.org/wiki/Length_extension_attack Change-Id: Id45097fc7e8435fadce4bda75769592af2730b0c Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- util/crossgcc/buildgcc | 236 +++++++++++++++++---- util/crossgcc/gpg.keyring | Bin 0 -> 222182 bytes util/crossgcc/sum/Python-3.5.1.tar.xz.cksum | 2 +- .../sum/acpica-unix2-20160831.tar.gz.cksum | 2 +- util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum | 2 +- .../sum/clang-tools-extra-3.8.0.src.tar.xz.cksum | 2 +- .../sum/compiler-rt-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum | 2 +- util/crossgcc/sum/gdb-7.11.tar.xz.cksum | 2 +- util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum | 2 +- util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum | 2 +- util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum | 2 +- util/crossgcc/sum/make-4.2.1.tar.bz2.cksum | 2 +- util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum | 2 +- util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum | 2 +- util/lint/lint-stable-003-whitespace | 2 +- 18 files changed, 206 insertions(+), 62 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d64b687..87e9491 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -5,6 +5,7 @@ # Stefan Reinauer <stefan.reinauer(a)coresystems.de> # # Copyright (C) 2011 by Sage Electronic Engineering +# Copyright (C) 2016 by Philipp Deppenwiese # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +19,9 @@ cd $(dirname $0) -CROSSGCC_DATE="August 31st, 2016" -CROSSGCC_VERSION="1.43" -CROSSGCC_COMMIT=$( git describe ) +CROSSGCC_DATE="November 07th, 2016" +CROSSGCC_VERSION="1.44" +CROSSGCC_COMMIT=$(git describe) # default settings PACKAGE=GCC @@ -32,6 +33,7 @@ DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 BOOTSTRAP=0 +GENERATE_CHECKSUMS=0 THREADS=1 # GCC toolchain version numbers @@ -50,6 +52,8 @@ EXPAT_VERSION=2.1.1 CLANG_VERSION=3.8.0 MAKE_VERSION=4.2.1 +GPG_KEYRING="$PWD/gpg.keyring" + # GCC toolchain archive locations # These are sanitized by the jenkins toolchain test builder, so if # a completely new URL is added here, it probably needs to be added @@ -100,6 +104,8 @@ red='\033[0;31m' RED='\033[1;31m' green='\033[0;32m' GREEN='\033[1;32m' +yellow='\033[0;33m' +YELLOW='\033[1;33m' blue='\033[0;34m' BLUE='\033[1;34m' cyan='\033[0;36m' @@ -154,6 +160,10 @@ searchtool() -gt 0 ]; then echo $i return + elif [ "$(cat /dev/null | $i version 2>&1 | grep -c "$search")" \ + -gt 0 ]; then + echo $i + return fi fi done @@ -261,60 +271,178 @@ check_cc() { fi } -check_sum() { - test -z "$CHECKSUM" || \ - test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ - "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +verify_signature() { + SIGNATURE_FILE="$1" + SOURCE_FILE="$2" + + if [ -z "${GPG}" ] ; then + printf "\n * ${RED}GPG tool not found. Please install gnupg on your os.${NC}\n" + return 1 + fi + + if [ ! -f "${GPG_KEYRING}" ]; then + printf "\n * ${RED}The gpg keyring can't be found.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SIGNATURE_FILE}" ]; then + printf "\n * ${RED}No signature file found for package: ${SOURCE_FILE} !! PLEASE CHECK MANUALLY WHAT YOU DOWNLOADED, ABORTING CHECKSUM CREATION.${NC}\n" + return 1 + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n * ${RED}Source file couldn't be downloaded.${NC}\n" + return 1 + fi + + GPG_OUTPUT=$(${GPG} --no-default-keyring --keyring "${GPG_KEYRING}" --status-fd 1 --verify "tarballs/${SIGNATURE_FILE}" "tarballs/${SOURCE_FILE}" 2>&1) + if [ "${?}" = "0" ] ; then + printf "\n * ${GREEN}Signature is good and verified!${NC}" + return 0 + fi + + printf "\n * ${RED}Failed to verify signature of package.${NC}\n" + printf "\n * ${RED}Error: ${GPG_OUTPUT} ${NC}\n" + return 1 +} + +calculate_checksum() { + SOURCE_FILE=$1 + + test ! -f sum/"${SOURCE_FILE}".cksum && test -f tarballs/"${SOURCE_FILE}" && \ + ("${OPENSSL}" sha384 tarballs/"${SOURCE_FILE}" > sum/"${SOURCE_FILE}".cksum) && \ + printf "\n * Checksum created. ${CYAN}Note. Please upload sum/${SOURCE_FILE}.cksum if the corresponding archive is upgraded.${NC}" +} + +verify_checksum() { + STATIC_HASH=$(cat sum/$1.cksum) + FILE_HASH=$(${OPENSSL} sha384 tarballs/$1) + + if [ "${STATIC_HASH}" != "${FILE_HASH}" ]; then + printf "\n * ${RED}Failed to verify checksum of package ${1}.${NC}\n" + exit 1 + fi + + printf "\n * ${GREEN}Checksum 0x${FILE_HASH} verified.${NC}\n" } -compute_sum() { - test ! -f sum/$1.cksum && test -f tarballs/$1 && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +validate_url() { + CHECK_URL=$(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') + if [ "$?" = "0" ] ; then + return 1 + else + return 0 + fi } download_showing_percentage() { - url=$1 - printf " ..${red} 0%%" - wget --no-check-certificate $url 2>&1 | while read line; do - echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' - done - printf "${NC}" + NO_WARNING="$2" + URL=$1 + printf " ..${YELLOW} 0%%${NC}" + + if ! validate_url ${URL}; then + wget ${URL} 2>&1 | while read line; do + printf "${YELLOW}" + echo $line | ${AWK} '/[0-9]\+%/ {printf("\b\b\b\b%4s", $1) }' + printf "${NC}" + done + if [ ${?} != "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + elif [ "$NO_WARNING" = "0" ]; then + printf "\n${YELLOW} * ${URL} is not valid.${NC}" + return 1 + fi + + return 0 } download() { package=$1 archive="$(eval echo \$$package"_ARCHIVE")" - FILE=$(basename $archive) - printf " * $FILE " + SOURCE_FILE=$(basename "${archive}") - if test -f tarballs/$FILE && check_sum $FILE ; then + if test -f "tarballs/${SOURCE_FILE}" ; then printf "(cached)" else + rm -f "tarballs/${SOURCE_FILE}"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " printf "(downloading from $archive)" - rm -f tarballs/$FILE - cd tarballs - download_showing_percentage $archive - cd .. - compute_sum $FILE + download_showing_percentage ${archive} 0 + + cd .. || exit 1 fi - if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + if [ ! -f tarballs/${SOURCE_FILE} ]; then + printf "\n${RED} * Failed to download ${SOURCE_FILE}.${NC}\n" exit 1 fi + + echo "" +} + +generate_checksums() { + package=$1 + archive="$(eval echo \$$package"_ARCHIVE")" + SOURCE_FILE=$(basename "${archive}") + SIGNATURE_FILE="dummy" + + rm -f "tarballs/${SOURCE_FILE}"* + rm -f "sum/${SOURCE_FILE}.cksum"* + cd tarballs || exit 1 + + printf " * ${SOURCE_FILE} " + printf "(downloading from ${archive})" + download_showing_percentage "${archive}" 0 + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.sig)" + + download_showing_percentage "${archive}.sig" 0 + if [ "${?}" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.sig) + fi + + printf "\n * ${SOURCE_FILE} " + printf "(downloading signature file ${archive}.asc)" + + download_showing_percentage "${archive}.asc" 0 + if [ "${?}" = "0" ] ; then + SIGNATURE_FILE=$(basename ${archive}.asc) + fi + + cd .. || exit 1 + + verify_signature "${SIGNATURE_FILE}" "${SOURCE_FILE}" + if [ "${?}" = "0" ] ; then + calculate_checksum "${SOURCE_FILE}" + verify_checksum "${SOURCE_FILE}" "${archive}" + fi + + if [ ! -f "tarballs/${SOURCE_FILE}" ]; then + printf "\n${RED}Failed to download ${SOURCE_FILE}.${NC}\n" + exit 1 + fi + printf "\n" } unpack_and_patch() { - package=$1 + package="$1" archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" - test -d ${dir} && test -f ${dir}/.unpack_success || ( + FILE=$(basename "$archive") + + verify_checksum "${FILE}" "${archive}" + + test -d "${dir}" && test -f "${dir}/.unpack_success" || ( printf " * $(basename $archive)\n" FLAGS=zxf - suffix=$(echo $archive | sed 's,.*\.,,') + suffix=$(echo "$archive" | sed 's,.*\.,,') if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" elif [ "$suffix" = "gz" ]; then FLAGS=zxf elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" @@ -426,7 +554,7 @@ cleanup() printf "Cleaning up temporary files... " for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package build-$package $(eval echo \$$package"_DIR") + rm -rf "build-${TARGETARCH}-$package" "build-$package" $(eval echo \$$package"_DIR") done rm -f getopt printf "${green}ok${NC}\n" @@ -434,7 +562,7 @@ cleanup() myhelp() { - printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S]\n" + printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-C] [-G] [-S] [-g]\n" printf " $0 [-V|--version]\n" printf " $0 [-h|--help]\n\n" @@ -464,7 +592,9 @@ myhelp() printf "GDB specific options:\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" + printf " [-S|--scripting] build scripting support for GDB\n" + printf " [-g|--generate-checksums] re-generates the checksum for all packages and\n" + printf " verifies them with the help of gpg signatures\n\n" printf "Platforms for GCC & GDB:\n" printf " x86_64 i386-elf i386-mingw32 mipsel-elf riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" @@ -481,6 +611,7 @@ myversion() cat << EOF Copyright (C) 2008-2010 by coresystems GmbH Copyright (C) 2011 by Sage Electronic Engineering +Copyright (C) 2016 by Philipp Deppenwiese This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -749,12 +880,12 @@ getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,generate_checksums,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:gun -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bp:l:P:j:D:tSys:gun $*) getopt_ret=$? set -- $args fi @@ -782,7 +913,8 @@ while true ; do -s|--supported) shift; PRINTSTABLE="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; -n|--nocolor) shift; \ - unset red RED green GREEN blue BLUE cyan CYAN NC;; + unset red RED green GREEN blue BLUE cyan CYAN yellow YELLOW NC;; + -g|--generate-checksums) shift; GENERATE_CHECKSUMS=1;; --) shift; break;; *) break;; esac @@ -848,6 +980,10 @@ case "$PACKAGE" in NAME="GNU Make" PACKAGES=MAKE ;; + ALL|all) + NAME="All packages" + PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC EXPAT PYTHON GDB LLVM CFE CRT CTE IASL MAKE" + ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n"; exit 1 @@ -856,15 +992,14 @@ esac # Find all the required tools: -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -#SHA512SUM=$(searchtool sha512sum) -#MD5SUM=$(searchtool md5sum) -CHECKSUM=$SHA1SUM -LBZIP2=$(searchtool lbzip2 "" nofail) -PIGZ=$(searchtool pigz "" nofail) +TAR=$(searchtool tar "tar") +PATCH=$(searchtool patch "patch") +MAKE=$(searchtool make "Make") +LBZIP2=$(searchtool lbzip2 "bzip2" nofail) +PIGZ=$(searchtool pigz "pigz" nofail) +GPG=$(searchtool gpg "gpg" nofail) +OPENSSL=$(searchtool openssl "openssl") +AWK=$(searchtool awk "Awk") searchtool m4 > /dev/null searchtool bison > /dev/null @@ -946,6 +1081,15 @@ if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi +if [ "$GENERATE_CHECKSUMS" = 1 ]; then + mkdir -p tarballs + for p in $PACKAGES; do + generate_checksums $p + done + + exit 0 +fi + # Prepare target directory for building GCC # (dependencies must be in the PATH) mkdir -p $DESTDIR$TARGETDIR/bin @@ -977,7 +1121,7 @@ printf "Packages built ... ${green}ok${NC}\n" # for reproducibility PROGNAME=$(basename "$0") rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*" -cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT" +cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT" cleanup diff --git a/util/crossgcc/gpg.keyring b/util/crossgcc/gpg.keyring new file mode 100644 index 0000000..8cbce7e Binary files /dev/null and b/util/crossgcc/gpg.keyring differ diff --git a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum index 58affb0..46f43a3 100644 --- a/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum +++ b/util/crossgcc/sum/Python-3.5.1.tar.xz.cksum @@ -1 +1 @@ -0186da436db76776196612b98bb9c2f76acfe90e tarballs/Python-3.5.1.tar.xz +SHA384(tarballs/Python-3.5.1.tar.xz)= 9aca49d2cde4760035f4fff23e8a446f6451e8effb6e6fab3f259645a631593acb2ce3412aadf810f103f3f6b561abe7 diff --git a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum index d7e538b..6b39768 100644 --- a/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum +++ b/util/crossgcc/sum/acpica-unix2-20160831.tar.gz.cksum @@ -1 +1 @@ -7e7449f15a195fefd72b65b1671df18e4dccf665 tarballs/acpica-unix2-20160831.tar.gz +SHA384(tarballs/acpica-unix2-20160831.tar.gz)= 171f914bbfc71a69011494cd3484bc87e5ce6b28558699585c8719c250094140357793ead18d2432573a61a1ea5afc6c diff --git a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum index 4bd0bce..b3a7126 100644 --- a/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum +++ b/util/crossgcc/sum/binutils-2.26.1.tar.bz2.cksum @@ -1 +1 @@ -624cd377e3a8eef3db83a56ce289a60f556b3ec2 tarballs/binutils-2.26.1.tar.bz2 +SHA384(tarballs/binutils-2.26.1.tar.bz2)= 30cc8be8c230d69b966b80268223b823b3d301c83472317a4b6ff3aa9dd528a31cb1af33640097854e0e34743b1339b7 diff --git a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum index 7ba8c8c..48ccfbf 100644 --- a/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/cfe-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce tarballs/cfe-3.8.0.src.tar.xz +SHA384(tarballs/cfe-3.8.0.src.tar.xz)= 3edbe3cafc58ad6fc3d3a133156a656ea7756e8a36176b29bba63434d6f073cef63241cc6df8337fcab3832dd5b5c485 diff --git a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum index e9d8d72..2c4154c 100644 --- a/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/clang-tools-extra-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -a99d8b6fc5e593c4671424b327779318a1856acf tarballs/clang-tools-extra-3.8.0.src.tar.xz +SHA384(tarballs/clang-tools-extra-3.8.0.src.tar.xz)= abd447239f09295f8592225bb7e07ba57cedc3d19a4972b45cd7d70a2db82106d1874a5be03656f8209a0e8a1308fb31 diff --git a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum index 081705d..8637b48 100644 --- a/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/compiler-rt-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -480ea09e369dac6de1f3759b27fa19417b26b69e tarballs/compiler-rt-3.8.0.src.tar.xz +SHA384(tarballs/compiler-rt-3.8.0.src.tar.xz)= 4560d512f3c3a0dbcc5c29ab7754b07d91ffa1ddc1c06a5215f3d325bc3f138ebf483e2a37abb10fc36cd125e6bf559e diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum index 882e501..e3a94fa 100644 --- a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum +++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum @@ -1 +1 @@ -ff91419882ac52151050dad0ee8190645fbeee08 tarballs/expat-2.1.1.tar.bz2 +SHA384(tarballs/expat-2.1.1.tar.bz2)= 816e8ca9ac57b6aac76e9979d11714313246492a49c228bb0a16d349174be45cd780d760524eb45acf12ff371e8b96a3 diff --git a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum index bb05e39..073390b 100644 --- a/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum +++ b/util/crossgcc/sum/gcc-5.3.0.tar.bz2.cksum @@ -1 +1 @@ -0612270b103941da08376df4d0ef4e5662a2e9eb tarballs/gcc-5.3.0.tar.bz2 +SHA384(tarballs/gcc-5.3.0.tar.bz2)= 4184972f66dc929686c30936cf8f5085829d8584118ebc3e2ec53a40754afbefc351cfd2c211c09dd3b6eb4ab4759820 diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum index ffe5a1c..f3082e7 100644 --- a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum +++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum @@ -1 +1 @@ -466208d771d97d3dfcf965d5c835a669cff8d847 tarballs/gdb-7.11.tar.xz +SHA384(tarballs/gdb-7.11.tar.xz)= 82f89ef35ea1916d5faa67b7fefa2ac3627894d245c43fb4e20828274566cbbb5d7f83899baad77a3cf7fe9fec6f8c7b diff --git a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum index 348b80f..e0ebab2 100644 --- a/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum +++ b/util/crossgcc/sum/gmp-6.1.0.tar.xz.cksum @@ -1 +1 @@ -99d691607613e749aa5d7c0c2a89aeab38fec070 tarballs/gmp-6.1.0.tar.xz +SHA384(tarballs/gmp-6.1.0.tar.xz)= ec69b394cbcf887ab0717473b04bb70ce30102abf24869eca5acb781de405d3a5670fabb776ba68cfe6e117631522d9f diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum index daa27c6..46f991d 100644 --- a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum +++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum @@ -1 +1 @@ -c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz +SHA384(tarballs/libelf-0.8.13.tar.gz)= 07fc0b1a40ba3d2b003899df199d1043bb5d44cf7d913e6460c985582e5275b634edb6af6779255d770010fd7d09580e diff --git a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum index 2f0af53..e407716 100644 --- a/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum +++ b/util/crossgcc/sum/llvm-3.8.0.src.tar.xz.cksum @@ -1 +1 @@ -723ac918979255706434a05f5af34b71c49c9971 tarballs/llvm-3.8.0.src.tar.xz +SHA384(tarballs/llvm-3.8.0.src.tar.xz)= 5d5a012e4d494a4534fcec7643ad28bab7467b96029b6d497e1d523357ae7c9e8bd86400dc90e261d791d6391a369b30 diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum index 34af72c..5c8a69c9 100644 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum @@ -1 +1 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 +SHA384(tarballs/make-4.2.1.tar.bz2)= 07fed67f907c8139cd27d606069ce20f219ccf1d047d2ebb2a2b3242d4332957a64b7ff8c3b5db4b28dcbbfdb2ad1e01 diff --git a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum index c7ca1ac..50c2c67 100644 --- a/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum +++ b/util/crossgcc/sum/mpc-1.0.3.tar.gz.cksum @@ -1 +1 @@ -b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 tarballs/mpc-1.0.3.tar.gz +SHA384(tarballs/mpc-1.0.3.tar.gz)= dceeb2566d6145fa771641d22de3bef866fa601fe1fa964bc680a275919080bd12bc1abab4f68cecdbaef71d295b7397 diff --git a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum index 90f90eb..88cd06c 100644 --- a/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum +++ b/util/crossgcc/sum/mpfr-3.1.4.tar.xz.cksum @@ -1 +1 @@ -cedc0055d55b6ee4cd17e1e6119ed412520ff81a tarballs/mpfr-3.1.4.tar.xz +SHA384(tarballs/mpfr-3.1.4.tar.xz)= 30a2807378f578544538810b24bb65d44268015e5d2390d8ae6383fe3939b3bba1e85279789400a226b365010de4bbcd diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 3dbd473..144cda1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.keyring$|\.patch$|\.bin$|\.hex$|\.jpg$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.,"

1 0

Patch set updated for coreboot: buildgcc: Test -fno-pie for broken Debian toolchain
by Nico Huber 06 Dec '16

06 Dec '16

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17743 -gerrit commit 63932e88a79871a5b25832b4a66a830e0f17f790 Author: Nico Huber <nico.h(a)gmx.de> Date: Tue Dec 6 23:57:33 2016 +0100 buildgcc: Test -fno-pie for broken Debian toolchain Current Debian-testing toolchain reportedly has `-fpie` enabled by default which breaks a lot things. Change-Id: I5f8645bb65576d2e2602096fdb110ccd60341220 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- util/crossgcc/buildgcc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 97c38b8..1131d2d 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -515,7 +515,8 @@ set_hostcflags_from_gmp() { } build_GMP() { - CC="$CC" ../${GMP_DIR}/configure --disable-shared --enable-fat \ + CC="$CC" CFLAGS="$HOSTCFLAGS" \ + ../${GMP_DIR}/configure --disable-shared --enable-fat \ --prefix=$TARGETDIR $OPTIONS \ || touch .failed $MAKE $JOBS || touch .failed @@ -946,7 +947,7 @@ if [ -z "${LANGUAGES}" ]; then fi fi # GCC -export HOSTCFLAGS="-Os" +export HOSTCFLAGS="-Os -fno-pie" if have_hostcflags_from_gmp; then set_hostcflags_from_gmp fi

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2016