coreboot-gerrit May 2016

coreboot-gerrit@coreboot.org

1 participants
1843 discussions

Patch set updated for coreboot: acpi_device: Add support for writing ACPI SPI descriptors
by Duncan Laurie 28 May '16

28 May '16

Duncan Laurie (dlaurie(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14936 -gerrit commit a483b832703923fa7972cffbd2a8f7e7fcdaa21f Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Tue May 10 07:26:34 2016 -0700 acpi_device: Add support for writing ACPI SPI descriptors Add required definitions to describe an ACPI SPI bus and a method to write the SpiSerialBus() descriptor to the SSDT. This will be used by device drivers to describe their SPI resources to the OS. SPI devices are not currently enumerated in the devicetree but can be enumerated by device drivers directly. generic.c: void acpi_fill_ssdt_generator(struct device *dev) { struct acpi_spi spi = { .device_select = dev->path->generic.device.id, .device_select_polarity = SPI_POLARITY_LOW, .spi_wire_mode = SPI_4_WIRE_MODE, .speed = 1000 * 1000; /* 1 mHz */ .data_bit_length = 8, .clock_phase = SPI_CLOCK_PHASE_FIRST, .clock_polarity = SPI_POLARITY_LOW, .resource = acpi_device_path(dev->bus->dev) }; ... acpi_device_write_spi(&spi); ... } devicetree.cb: device pci 1e.2 on chip drivers/spi/generic device generic 0 on end end end SSDT.dsl: SpiSerialBus (0, PolarityLow, FourWireMode, 8, ControllerInitiated, 1000000, ClockPolarityLow, ClockPhaseFirst, "\\_SB.PCI0.SPI0", 0, ResourceConsumer) Change-Id: I0ef83dc111ac6c19d68872ab64e1e5e3a7756cae Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> --- src/arch/x86/acpi_device.c | 72 +++++++++++++++++++++++++++++++++ src/arch/x86/include/arch/acpi_device.h | 44 ++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c index 3c0230f..073b938 100644 --- a/src/arch/x86/acpi_device.c +++ b/src/arch/x86/acpi_device.c @@ -381,3 +381,75 @@ void acpi_device_write_i2c(const struct acpi_i2c *i2c) /* Fill in I2C Descriptor Length */ acpi_device_fill_len(desc_length); } + +/* ACPI 6.1 section 6.4.3.8.2.2 - SpiSerialBus() */ +void acpi_device_write_spi(const struct acpi_spi *spi) +{ + void *desc_length, *type_length; + uint16_t flags = 0; + + /* Byte 0: Descriptor Type */ + acpigen_emit_byte(ACPI_DESCRIPTOR_SERIAL_BUS); + + /* Byte 1+2: Length (filled in later) */ + desc_length = acpi_device_write_zero_len(); + + /* Byte 3: Revision ID */ + acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID); + + /* Byte 4: Resource Source Index is Reserved */ + acpigen_emit_byte(0); + + /* Byte 5: Serial Bus Type is SPI */ + acpigen_emit_byte(ACPI_SERIAL_BUS_TYPE_SPI); + + /* + * Byte 6: Flags + * [7:2]: 0 => Reserved + * [1]: 1 => ResourceConsumer + * [0]: 0 => ControllerInitiated + */ + acpigen_emit_byte(1 << 1); + + /* + * Byte 7-8: Type Specific Flags + * [15:2]: 0 => Reserved + * [1]: 0 => ActiveLow, 1 => ActiveHigh + * [0]: 0 => FourWire, 1 => ThreeWire + */ + if (spi->wire_mode == SPI_3_WIRE_MODE) + flags |= 1 << 0; + if (spi->device_select_polarity == SPI_POLARITY_HIGH) + flags |= 1 << 1; + acpigen_emit_word(flags); + + /* Byte 9: Type Specific Revision ID */ + acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID); + + /* Byte 10-11: SPI Type Data Length */ + type_length = acpi_device_write_zero_len(); + + /* Byte 12-15: Connection Speed */ + acpigen_emit_dword(spi->speed); + + /* Byte 16: Data Bit Length */ + acpigen_emit_byte(spi->data_bit_length); + + /* Byte 17: Clock Phase */ + acpigen_emit_byte(spi->clock_phase); + + /* Byte 18: Clock Polarity */ + acpigen_emit_byte(spi->clock_polarity); + + /* Byte 19-20: Device Selection */ + acpigen_emit_word(spi->device_select); + + /* Fill in Type Data Length */ + acpi_device_fill_len(type_length); + + /* Byte 21+: ResourceSource String */ + acpigen_emit_string(spi->resource); + + /* Fill in SPI Descriptor Length */ + acpi_device_fill_len(desc_length); +} diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index 7b5001f..dc7f26c 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -164,6 +164,7 @@ void acpi_device_write_gpio(const struct acpi_gpio *gpio); */ #define ACPI_SERIAL_BUS_TYPE_I2C 1 +#define ACPI_SERIAL_BUS_TYPE_SPI 2 #define ACPI_SERIAL_BUS_REVISION_ID 1 /* @@ -184,4 +185,47 @@ struct acpi_i2c { /* Write I2cSerialBus() descriptor to SSDT AML output */ void acpi_device_write_i2c(const struct acpi_i2c *i2c); +/* + * ACPI SPI Bus + */ + +enum spi_clock_phase { + SPI_CLOCK_PHASE_FIRST, + SPI_CLOCK_PHASE_SECOND +}; + +/* SPI Flags bit 0 */ +enum spi_wire_mode { + SPI_4_WIRE_MODE, + SPI_3_WIRE_MODE +}; + +/* SPI Flags bit 1 */ +enum spi_polarity { + SPI_POLARITY_LOW, + SPI_POLARITY_HIGH +}; + +struct acpi_spi { + /* Device selection */ + uint16_t device_select; + /* Device selection line is active high or low */ + enum spi_polarity device_select_polarity; + /* 3 or 4 wire SPI connection */ + enum spi_wire_mode wire_mode; + /* Connection speed in HZ */ + unsigned int speed; + /* Size in bits of smallest transfer unit */ + u8 data_bit_length; + /* Phase of clock pulse on which to capture data */ + enum spi_clock_phase clock_phase; + /* Indicate if clock is high or low during first phase */ + enum spi_polarity clock_polarity; + /* Reference to SPI controller */ + const char *resource; +}; + +/* Write SPI Bus descriptor to SSDT AML output */ +void acpi_device_write_spi(const struct acpi_spi *spi); + #endif

1 0

Patch set updated for coreboot: acpi_device: Add support for writing ACPI I2C descriptors
by Duncan Laurie 28 May '16

28 May '16

Duncan Laurie (dlaurie(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14935 -gerrit commit 4820479c9f31ef0721b3524303f1e26e99a55ea9 Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Mon May 9 20:10:47 2016 -0700 acpi_device: Add support for writing ACPI I2C descriptors Add required definitions to describe an ACPI I2C bus and a method to write the I2cSerialBus() descriptor to the SSDT. This will be used by device drivers to describe their I2C resources to the OS. The devicetree i2c device can supply the address and 7 or 10 bit mode as well as indicate the GPIO controller device, and the bus speed can be fixed or configured by the driver. chip.h: struct drivers_i2c_generic_config { enum i2c_speed bus_speed; }; generic.c: void acpi_fill_ssdt_generator(struct device *dev) { struct drivers_i2c_generic_config *config = dev->chip_info; struct acpi_i2c i2c = { .address = dev->path->i2c.device, .mode_10bit = dev->path.i2c.mode_10bit, .speed = config->bus_speed ? : I2C_SPEED_FAST, .resource = acpi_device_path(dev->bus->dev) }; ... acpi_device_write_i2c(&i2c); ... } devicetree.cb: device pci 15.0 on chip drivers/i2c/generic device i2c 10.0 on end end end SSDT.dsl: I2cSerialBus (0x10, ControllerInitiated, 400000, AddressingMode7Bit, "\\_SB.PCI0.I2C0", 0, ResourceConsumer) Change-Id: I598401ac81a92c72f19da0271af1e218580a6c49 Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> --- src/arch/x86/acpi_device.c | 58 +++++++++++++++++++++++++++++++++ src/arch/x86/include/arch/acpi_device.h | 27 +++++++++++++++ src/include/device/i2c.h | 13 ++++++++ 3 files changed, 98 insertions(+) diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c index 610b922..3c0230f 100644 --- a/src/arch/x86/acpi_device.c +++ b/src/arch/x86/acpi_device.c @@ -18,6 +18,7 @@ #include <arch/acpi_device.h> #include <arch/acpigen.h> #include <device/device.h> +#include <device/i2c.h> #include <device/path.h> #if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) #include <gpio.h> @@ -323,3 +324,60 @@ void acpi_device_write_gpio(const struct acpi_gpio *gpio) /* Fill in GPIO Descriptor Length (account for len word) */ acpi_device_fill_len(desc_length); } + +/* ACPI 6.1 section 6.4.3.8.2.1 - I2cSerialBus() */ +void acpi_device_write_i2c(const struct acpi_i2c *i2c) +{ + void *desc_length, *type_length; + + /* Byte 0: Descriptor Type */ + acpigen_emit_byte(ACPI_DESCRIPTOR_SERIAL_BUS); + + /* Byte 1+2: Length (filled in later) */ + desc_length = acpi_device_write_zero_len(); + + /* Byte 3: Revision ID */ + acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID); + + /* Byte 4: Resource Source Index is Reserved */ + acpigen_emit_byte(0); + + /* Byte 5: Serial Bus Type is I2C */ + acpigen_emit_byte(ACPI_SERIAL_BUS_TYPE_I2C); + + /* + * Byte 6: Flags + * [7:2]: 0 => Reserved + * [1]: 1 => ResourceConsumer + * [0]: 0 => ControllerInitiated + */ + acpigen_emit_byte(1 << 1); + + /* + * Byte 7-8: Type Specific Flags + * [15:1]: 0 => Reserved + * [0]: 0 => 7bit, 1 => 10bit + */ + acpigen_emit_word(i2c->mode_10bit); + + /* Byte 9: Type Specific Revision ID */ + acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID); + + /* Byte 10-11: I2C Type Data Length */ + type_length = acpi_device_write_zero_len(); + + /* Byte 12-15: I2C Bus Speed */ + acpigen_emit_dword(i2c->speed); + + /* Byte 16-17: I2C Slave Address */ + acpigen_emit_word(i2c->address); + + /* Fill in Type Data Length */ + acpi_device_fill_len(type_length); + + /* Byte 18+: ResourceSource */ + acpigen_emit_string(i2c->resource); + + /* Fill in I2C Descriptor Length */ + acpi_device_fill_len(desc_length); +} diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index a81cee0..7b5001f 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -16,11 +16,13 @@ #ifndef __ACPI_DEVICE_H #define __ACPI_DEVICE_H +#include <device/i2c.h> #include <stdint.h> #define ACPI_DESCRIPTOR_LARGE (1 << 7) #define ACPI_DESCRIPTOR_INTERRUPT (ACPI_DESCRIPTOR_LARGE | 9) #define ACPI_DESCRIPTOR_GPIO (ACPI_DESCRIPTOR_LARGE | 12) +#define ACPI_DESCRIPTOR_SERIAL_BUS (ACPI_DESCRIPTOR_LARGE | 14) struct device; const char *acpi_device_name(struct device *dev); @@ -157,4 +159,29 @@ struct acpi_gpio { /* Write GpioIo() or GpioInt() descriptor to SSDT AML output */ void acpi_device_write_gpio(const struct acpi_gpio *gpio); +/* + * ACPI Descriptors for Serial Bus interfaces + */ + +#define ACPI_SERIAL_BUS_TYPE_I2C 1 +#define ACPI_SERIAL_BUS_REVISION_ID 1 + +/* + * ACPI I2C Bus + */ + +struct acpi_i2c { + /* I2C Address */ + uint16_t address; + /* 7 or 10 bit Address Mode */ + enum i2c_address_mode mode_10bit; + /* I2C Bus Speed in Hz */ + enum i2c_speed speed; + /* Reference to I2C controller */ + const char *resource; +}; + +/* Write I2cSerialBus() descriptor to SSDT AML output */ +void acpi_device_write_i2c(const struct acpi_i2c *i2c); + #endif diff --git a/src/include/device/i2c.h b/src/include/device/i2c.h index b152bb9..c8c7b22 100644 --- a/src/include/device/i2c.h +++ b/src/include/device/i2c.h @@ -19,6 +19,19 @@ #include <stdint.h> #include <stdlib.h> +enum i2c_speed { + I2C_SPEED_STANDARD = 100000, + I2C_SPEED_FAST = 400000, + I2C_SPEED_FAST_PLUS = 1000000, + I2C_SPEED_HIGH = 3400000, + I2C_SPEED_FAST_ULTRA = 5000000, +}; + +enum i2c_address_mode { + I2C_MODE_7_BIT, + I2C_MODE_10_BIT +}; + struct i2c_seg { int read;

1 0

Patch set updated for coreboot: acpi_device: Add support for writing ACPI GPIO descriptors
by Duncan Laurie 28 May '16

28 May '16

Duncan Laurie (dlaurie(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14934 -gerrit commit 654e02ce3f2f95de41294431550d8c7041af4585 Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Mon May 9 17:08:38 2016 -0700 acpi_device: Add support for writing ACPI GPIO descriptors Add definitions to describe GPIOs in generated ACPI objects and a method to write a GpioIo() or GpioInt() descriptor to the SSDT. ACPI GPIOs have many possible configuration options and a structure is created to describe it accurately in ACPI terms. There are many shared descriptor fields between GpioIo() and GpioInt() so the same function can write both types. GpioInt shares many properties with ACPI Interrupts and the same types are re-used here where possible. One addition is that GpioInt can be configured to trigger on both low and high edge transitions. One descriptor can describe multiple GPIO pins (limited to 8 in this implementation) that all share configuration and controller and are used by the same device scope. Accurately referring to the GPIO controller that this pin is connected to requires the SoC/board to implement a function handler for acpi_gpio_path(), or for the caller to provide this directly as a string in the acpi_gpio->reference variable. This will get used by device drivers to describe their resources in the SSDT. Here is a sample for a Maxim 98357A I2S codec which has a GPIO for power and channel selection called "sdmode". chip.h: struct drivers_generic_max98357a_config { struct acpi_gpio sdmode_gpio; }; max98357a.c: void acpi_fill_ssdt_generator(struct device *dev) { struct drivers_generic_max98357a_config *config = dev->chip_info; ... acpi_device_write_gpio(&config->sdmode_gpio); ... } devicetree.cb: device pci 1f.3 on chip drivers/generic/max98357a register "sdmode_gpio" = "ACPI_GPIO_OUTPUT(GPP_C5)" device generic 0 on end end end SSDT.dsl: GpioIo (Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly, "\\_SB.PCI0.GPIO", 0, ResourceConsumer, ,) { 53 } Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> Change-Id: Ibf5bab9c4bf6f21252373fb013e78f872550b167 --- src/arch/x86/acpi_device.c | 139 ++++++++++++++++++++++++++++++++ src/arch/x86/include/arch/acpi_device.h | 75 +++++++++++++++++ 2 files changed, 214 insertions(+) diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c index b607834..610b922 100644 --- a/src/arch/x86/acpi_device.c +++ b/src/arch/x86/acpi_device.c @@ -19,6 +19,9 @@ #include <arch/acpigen.h> #include <device/device.h> #include <device/path.h> +#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) +#include <gpio.h> +#endif /* Write empty word value and return pointer to it */ static void *acpi_device_write_zero_len(void) @@ -184,3 +187,139 @@ void acpi_device_write_interrupt(const struct acpi_irq *irq) /* Fill in Descriptor Length (account for len word) */ acpi_device_fill_len(desc_length); } + +/* ACPI 6.1 section 6.4.3.8.1 - GPIO Interrupt or I/O */ +void acpi_device_write_gpio(const struct acpi_gpio *gpio) +{ + void *start, *desc_length; + void *pin_table_offset, *vendor_data_offset, *resource_offset; + uint16_t flags = 0; + int pin; + + if (!gpio || gpio->type > ACPI_GPIO_TYPE_IO) + return; + + start = acpigen_get_current(); + + /* Byte 0: Descriptor Type */ + acpigen_emit_byte(ACPI_DESCRIPTOR_GPIO); + + /* Byte 1-2: Length (fill in later) */ + desc_length = acpi_device_write_zero_len(); + + /* Byte 3: Revision ID */ + acpigen_emit_byte(ACPI_GPIO_REVISION_ID); + + /* Byte 4: GpioIo or GpioInt */ + acpigen_emit_byte(gpio->type); + + /* + * Byte 5-6: General Flags + * [15:1]: 0 => Reserved + * [0]: 1 => ResourceConsumer + */ + acpigen_emit_word(1 << 0); + + switch (gpio->type) { + case ACPI_GPIO_TYPE_INTERRUPT: + /* + * Byte 7-8: GPIO Interrupt Flags + * [15:5]: 0 => Reserved + * [4]: Wake (0=NO_WAKE 1=WAKE) + * [3]: Sharing (0=EXCLUSIVE 1=SHARED) + * [2:1]: Polarity (0=HIGH 1=LOW 2=BOTH) + * [0]: Mode (0=LEVEL 1=EDGE) + */ + if (gpio->irq.mode == IRQ_EDGE_TRIGGERED) + flags |= 1 << 0; + if (gpio->irq.shared == IRQ_SHARED) + flags |= 1 << 3; + if (gpio->irq.wake == IRQ_WAKE) + flags |= 1 << 4; + + switch (gpio->irq.polarity) { + case IRQ_ACTIVE_HIGH: + flags |= 0 << 1; + break; + case IRQ_ACTIVE_LOW: + flags |= 1 << 1; + break; + case IRQ_ACTIVE_BOTH: + flags |= 2 << 1; + break; + } + break; + + case ACPI_GPIO_TYPE_IO: + /* + * Byte 7-8: GPIO IO Flags + * [15:4]: 0 => Reserved + * [3]: Sharing (0=EXCLUSIVE 1=SHARED) + * [2]: 0 => Reserved + * [1:0]: IO Restriction + * 0 => IoRestrictionNone + * 1 => IoRestrictionInputOnly + * 2 => IoRestrictionOutputOnly + * 3 => IoRestrictionNoneAndPreserve + */ + flags |= gpio->io_restrict & 3; + if (gpio->io_shared) + flags |= 1 << 3; + break; + } + acpigen_emit_word(flags); + + /* + * Byte 9: Pin Configuration + * 0x01 => Default (no configuration applied) + * 0x02 => Pull-up + * 0x03 => Pull-down + * 0x04-0x7F => Reserved + * 0x80-0xff => Vendor defined + */ + acpigen_emit_byte(gpio->pull); + + /* Byte 10-11: Output Drive Strength in 1/100 mA */ + acpigen_emit_word(gpio->output_drive_strength); + + /* Byte 12-13: Debounce Timeout in 1/100 ms */ + acpigen_emit_word(gpio->interrupt_debounce_timeout); + + /* Byte 14-15: Pin Table Offset, relative to start */ + pin_table_offset = acpi_device_write_zero_len(); + + /* Byte 16: Reserved */ + acpigen_emit_byte(0); + + /* Byte 17-18: Resource Source Name Offset, relative to start */ + resource_offset = acpi_device_write_zero_len(); + + /* Byte 19-20: Vendor Data Offset, relative to start */ + vendor_data_offset = acpi_device_write_zero_len(); + + /* Byte 21-22: Vendor Data Length */ + acpigen_emit_word(0); + + /* Fill in Pin Table Offset */ + acpi_device_fill_from_len(pin_table_offset, start); + + /* Pin Table, one word for each pin */ + for (pin = 0; pin < gpio->pin_count; pin++) + acpigen_emit_word(gpio->pins[pin]); + + /* Fill in Resource Source Name Offset */ + acpi_device_fill_from_len(resource_offset, start); + + /* Resource Source Name String */ +#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) + acpigen_emit_string(gpio->resource ? : gpio_acpi_path(gpio->pins[0])); +#else + acpigen_emit_string(gpio->resource); +#endif + + /* Fill in Vendor Data Offset */ + acpi_device_fill_from_len(vendor_data_offset, start); + + /* Fill in GPIO Descriptor Length (account for len word) */ + acpi_device_fill_len(desc_length); +} diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index 60f7e00..a81cee0 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -16,8 +16,11 @@ #ifndef __ACPI_DEVICE_H #define __ACPI_DEVICE_H +#include <stdint.h> + #define ACPI_DESCRIPTOR_LARGE (1 << 7) #define ACPI_DESCRIPTOR_INTERRUPT (ACPI_DESCRIPTOR_LARGE | 9) +#define ACPI_DESCRIPTOR_GPIO (ACPI_DESCRIPTOR_LARGE | 12) struct device; const char *acpi_device_name(struct device *dev); @@ -82,4 +85,76 @@ struct acpi_irq { /* Write extended Interrupt() descriptor to SSDT AML output */ void acpi_device_write_interrupt(const struct acpi_irq *irq); +/* + * ACPI Descriptors for GpioIo() and GpioInterrupt() + */ + +enum acpi_gpio_type { + ACPI_GPIO_TYPE_INTERRUPT, + ACPI_GPIO_TYPE_IO +}; + +enum acpi_gpio_pull { + ACPI_GPIO_PULL_DEFAULT, + ACPI_GPIO_PULL_UP, + ACPI_GPIO_PULL_DOWN, + ACPI_GPIO_PULL_NONE +}; + +enum acpi_gpio_io_restrict { + ACPI_GPIO_IO_RESTRICT_NONE, + ACPI_GPIO_IO_RESTRICT_INPUT, + ACPI_GPIO_IO_RESTRICT_OUTPUT, + ACPI_GPIO_IO_RESTRICT_PRESERVE +}; + +#define ACPI_GPIO_REVISION_ID 1 +#define ACPI_GPIO_MAX_PINS 8 + +struct acpi_gpio { + int pin_count; + uint16_t pins[ACPI_GPIO_MAX_PINS]; + + enum acpi_gpio_type type; + enum acpi_gpio_pull pull; + const char *resource; + + /* GpioInt */ + uint16_t interrupt_debounce_timeout; /* 1/100 ms */ + struct acpi_irq irq; + + /* GpioIo */ + uint16_t output_drive_strength; /* 1/100 mA */ + int io_shared; + enum acpi_gpio_io_restrict io_restrict; +}; + +/* Basic output GPIO with default pull settings */ +#define ACPI_GPIO_OUTPUT(gpio) { \ + .type = ACPI_GPIO_TYPE_IO, \ + .pull = ACPI_GPIO_PULL_DEFAULT, \ + .io_restrict = ACPI_GPIO_IO_RESTRICT_OUTPUT, \ + .pin_count = 1, \ + .pins = { (gpio) } } + +/* Basic input GPIO with default pull settings */ +#define ACPI_GPIO_INPUT(gpio) { \ + .type = ACPI_GPIO_TYPE_IO, \ + .pull = ACPI_GPIO_PULL_DEFAULT, \ + .io_restrict = ACPI_GPIO_IO_RESTRICT_INPUT, \ + .pin_count = 1, \ + .pins = { (gpio) } } + +/* Basic interrupt GPIO with default pull settings */ +#define ACPI_GPIO_INTERRUPT(gpio,mode,polarity) { \ + .type = ACPI_GPIO_TYPE_INTERRUPT, \ + .pull = ACPI_GPIO_PULL_DEFAULT, \ + .irq.mode = (mode), \ + .irq.polarity = (polarity), \ + .pin_count = 1, \ + .pins = { (gpio) } } + +/* Write GpioIo() or GpioInt() descriptor to SSDT AML output */ +void acpi_device_write_gpio(const struct acpi_gpio *gpio); + #endif

1 0

Patch merged into coreboot/master: acpi_device: Add support for writing ACPI Interrupt descriptors
by gerrit＠coreboot.org 28 May '16

28 May '16

the following patch was just integrated into master: commit 6b7c1f605c67f18996c584970a83fc5296c94747 Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Mon May 9 15:38:36 2016 -0700 acpi_device: Add support for writing ACPI Interrupt descriptors Add definitions for ACPI device extended interrupts and a method to write an Interrupt() descriptor to the SSDT output stream. Interrupts are often tied together with other resources and some configuration items are shared (though not always compatibly) with other constructs like GPIOs and GPEs. These will get used by device drivers to write _CRS sections for devices into the SSDT. One usage is to include a "struct acpi_irq" inside a config struct for a device so it can be initialized based on settings in devicetree. Example usage: chip.h: struct drivers_i2c_generic_config { struct acpi_irq irq; }; generic.c: void acpi_fill_ssdt_generator(struct device *dev) { struct drivers_i2c_generic_config *config = dev->chip_info; ... acpi_device_write_interrupt(&config->irq); ... } devicetree.cb: device pci 15.0 on chip drivers/i2c/generic register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end end SSDT.dsl: Interrupt (ResourceConsumer, Edge, ActiveLow, Exclusive,,,) { 31 } Change-Id: I3b64170cc2ebac178e7a17df479eda7670a42703 Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> Reviewed-on: https://review.coreboot.org/14933 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See https://review.coreboot.org/14933 for details. -gerrit

1 0

New patch to review for coreboot: reef: Remove si-all region from chromeos.fmd
by Furquan Shaikh 28 May '16

28 May '16

Furquan Shaikh (furquan(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14990 -gerrit commit 62383ca2ce6f51a69a4c56f61c162e2f6bfd2140 Author: Furquan Shaikh <furquan(a)google.com> Date: Fri May 27 16:43:26 2016 -0700 reef: Remove si-all region from chromeos.fmd This matches the change in depthcharge fmap.dts to remove si-all region and mark si-desc as ifd. CQ-DEPEND=CL:347986 BUG=chrome-os-partner:53689 BRANCH=None TEST=Compiles successfully Change-Id: Ic7ed94fcdfb9a79bd6ceb960830f67678b0291b6 Signed-off-by: Furquan Shaikh <furquan(a)google.com> --- src/mainboard/google/reef/chromeos.fmd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mainboard/google/reef/chromeos.fmd b/src/mainboard/google/reef/chromeos.fmd index 3f7c3aa..2a581be 100644 --- a/src/mainboard/google/reef/chromeos.fmd +++ b/src/mainboard/google/reef/chromeos.fmd @@ -1,9 +1,7 @@ FLASH 8M { WP_RO@0x0 0x400000 { - SI_ALL@0x0 0x200000 { - SI_DESC@0x0 0x1000 - bootblock@0x7c480 0x8000 - } + SI_DESC@0x0 0x1000 + bootblock@0x7c480 0x8000 RO_SECTION@0x200000 0x200000 { RO_VPD@0x0 0x4000 FMAP@0x4000 0x800

1 0

Patch set updated for coreboot: [intel/amenia]: Add asl code to enable google ChromeEC
by Shaunak Saha 28 May '16

28 May '16

Shaunak Saha (shaunak.saha(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14987 -gerrit commit 58f331329f950efa870ac0ef5417a0642ec9d4d7 Author: Shaunak Saha <shaunak.saha(a)intel.com> Date: Fri May 27 01:13:16 2016 -0700 [intel/amenia]: Add asl code to enable google ChromeEC This patch adds asl code to include support for Google ChromeEC. We need this to show the battery icon and notifications like charger connect/disconnect etc. BUG = 53096 TEST = Plug/Unplug AC Adapter multiple times and make sure the battery connected is charging properly. Change-Id: Id908f145789402573ea54fc4f15cf7a0e651ebf4 Signed-off-by: Shaunak Saha <shaunak.saha(a)intel.com> --- src/mainboard/intel/amenia/acpi/ec.asl | 26 ++++++++++++++++++++++++++ src/mainboard/intel/amenia/acpi/mainboard.asl | 26 ++++++++++++++++++++++++++ src/mainboard/intel/amenia/dsdt.asl | 7 ++++++- src/mainboard/intel/amenia/ec.h | 4 ++++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/mainboard/intel/amenia/acpi/ec.asl b/src/mainboard/intel/amenia/acpi/ec.asl new file mode 100644 index 0000000..fe53cb5 --- /dev/null +++ b/src/mainboard/intel/amenia/acpi/ec.asl @@ -0,0 +1,26 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Google Inc. + * + * 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; version 2 of the License. + * + * 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. + */ + +/* mainboard configuration */ +#include "../ec.h" + +/* Enable EC backed ALS device in ACPI */ +#define EC_ENABLE_ALS_DEVICE + +/* Enable EC backed PD MCU device in ACPI */ +#define EC_ENABLE_PD_MCU_DEVICE + +/* ACPI code for EC functions */ +#include <ec/google/chromeec/acpi/ec.asl> diff --git a/src/mainboard/intel/amenia/acpi/mainboard.asl b/src/mainboard/intel/amenia/acpi/mainboard.asl index 09ef9b4..c83f48f 100644 --- a/src/mainboard/intel/amenia/acpi/mainboard.asl +++ b/src/mainboard/intel/amenia/acpi/mainboard.asl @@ -16,6 +16,23 @@ */ #include <soc/gpio_defs.h> +Scope (\_SB) +{ + Device (LID0) + { + Name (_HID, EisaId ("PNP0C0D")) + Method (_LID, 0) + { + Return (\_SB.PCI0.LPCB.EC0.LIDS) + } + } + + Device (PWRB) + { + Name (_HID, EisaId ("PNP0C0C")) + } +} + Scope (\_SB.PCI0.I2C4) { /* Standard Mode: HCNT, LCNT, SDA Hold Register */ @@ -91,3 +108,12 @@ Scope (\_SB.PCI0.I2C3) } } } + +/* + * LPC Trusted Platform Module + */ +Scope (\_SB.PCI0.LPCB) +{ + #include <drivers/pc80/tpm/acpi/tpm.asl> + #include "ec.asl" +} diff --git a/src/mainboard/intel/amenia/dsdt.asl b/src/mainboard/intel/amenia/dsdt.asl index 19e7360..4a64f87 100644 --- a/src/mainboard/intel/amenia/dsdt.asl +++ b/src/mainboard/intel/amenia/dsdt.asl @@ -24,6 +24,12 @@ DefinitionBlock( 0x20110725 // OEM revision ) { + /* global NVS and variables */ + #include <soc/intel/apollolake/acpi/globalnvs.asl> + + /* CPU */ + #include <soc/intel/apollolake/acpi/cpu.asl> + Scope (\_SB) { Device (PCI0) { @@ -38,5 +44,4 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/sleepstates.asl> #include "acpi/superio.asl" - } diff --git a/src/mainboard/intel/amenia/ec.h b/src/mainboard/intel/amenia/ec.h index ab8bcba..91890fd 100644 --- a/src/mainboard/intel/amenia/ec.h +++ b/src/mainboard/intel/amenia/ec.h @@ -20,6 +20,10 @@ #include <ec/google/chromeec/ec_commands.h> +/* This is the GPE status bit. + TODO: Fix this to proper bit matching GPE routing table */ +#define EC_SCI_GPI 15 + #define MAINBOARD_EC_SCI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\

1 0

New patch to review for coreboot: tint: Fix tint and add Kconfig option
by Antonello Dettori 27 May '16

27 May '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14989 -gerrit commit da2c08e07fd51c33fd5f73acff2b0a8d1aef812a Author: Antonello Dettori <dettori.an(a)gmail.com> Date: Fri May 27 23:44:47 2016 +0200 tint: Fix tint and add Kconfig option Fixes the compiler errors with tint, improves the Makefile, adds Kconfig integration and secondary payload option. Change-Id: Ia99e30f566d5ccf0d083e52bf174970535daefc5 Signed-off-by: Antonello Dettori <dettori.an(a)gmail.com> --- payloads/Kconfig | 8 + payloads/Makefile.inc | 8 +- payloads/external/Makefile.inc | 4 + payloads/external/tint/Makefile | 33 + payloads/external/tint/README | 8 - payloads/external/tint/libpayload_tint.patch | 925 +++++++++++++++++++++------ 6 files changed, 776 insertions(+), 210 deletions(-) diff --git a/payloads/Kconfig b/payloads/Kconfig index 6c178d4..84d20a5 100644 --- a/payloads/Kconfig +++ b/payloads/Kconfig @@ -106,5 +106,13 @@ config NVRAMCUI_SECONDARY_PAYLOAD nvramcui can be loaded as a secondary payload under SeaBIOS, GRUB, or any other payload that can load additional payloads. +config TINT_SECONDARY_PAYLOAD + bool "Load tint as a secondary payload" + default n + depends on ARCH_X86 + help + tint can be loaded as a secondary payload under SeaBIOS, GRUB, + or any other payload that can load additional payloads. + endmenu # "Secondary Payloads" endmenu diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index e68c2e7..ccd6e04 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -29,7 +29,8 @@ payloads/external/depthcharge \ payloads/external/SeaBIOS \ payloads/external/U-Boot \ payloads/external/Memtest86Plus \ -payloads/external/iPXE +payloads/external/iPXE \ +payloads/external/tint payloads/coreinfo/build/coreinfo.elf coreinfo: $(MAKE) -C payloads/coreinfo defaultbuild @@ -37,6 +38,9 @@ payloads/coreinfo/build/coreinfo.elf coreinfo: payloads/nvramcui/nvramcui.elf nvramcui: $(MAKE) -C payloads/nvramcui +payloads/external/tint/tint/tint.elf tint: + $(MAKE) -C payloads/external/tint + clean-payloads: $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) clean; ) @@ -46,4 +50,4 @@ distclean-payloads: print-repo-info-payloads: -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) -.PHONY: clean-payloads distclean-payloads print-repo-info-payloads nvramcui coreinfo +.PHONY: clean-payloads distclean-payloads print-repo-info-payloads nvramcui coreinfo tint diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 65b3dd2..38b83a1 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -126,6 +126,10 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) endif +cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint +img/tint-file := payloads/external/tint/tint/tint.elf +img/tint-type := payload + payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) $(MAKE) -C payloads/external/Memtest86Plus all \ CC="$(CC_x86_32)" \ diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile new file mode 100644 index 0000000..0fba6e7 --- /dev/null +++ b/payloads/external/tint/Makefile @@ -0,0 +1,33 @@ +project_url=http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool/main/t/tint/tint_0.03b.tar.gz +archive_name=tint_0.03b.tar.gz + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES + +all: tint + +tint: patch + echo " MAKE TINT " + $(MAKE) -C tint + +patch: download + cd tint; \ + if [ -e debian ]; then patch -l -p1 < ../libpayload_tint.patch; fi + +download: + test -d tint || { wget $(project_url); \ + tar -xvf $(archive_name); \ + rm $(archive_name); \ + mv tint-0.03b tint; } + +clean: + test -d tint && $(MAKE) -C tint clean || exit 0 + +distclean: + rm -rf tint + +.PHONY: download patch tint clean distclean diff --git a/payloads/external/tint/README b/payloads/external/tint/README deleted file mode 100644 index 45a015d..0000000 --- a/payloads/external/tint/README +++ /dev/null @@ -1,8 +0,0 @@ -------------------------------------------------------------------------------- -tint -------------------------------------------------------------------------------- - -For instructions on how to download, patch, and build tint as a coreboot -payload, please see - - http://www.coreboot.org/Tint diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch index 9587410..c261fc1 100644 --- a/payloads/external/tint/libpayload_tint.patch +++ b/payloads/external/tint/libpayload_tint.patch @@ -1,90 +1,6 @@ -Patch tint 0.03b to be usable as coreboot payload, linked against -the libpayload library. - -Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> - - -Add default libpayload build, xcompile, and lpgcc setup to tint. - -Signed-off-by: Marc Jones <marc.jones(a)gmail.com> - -diff -rupN tintorig/Makefile tint/Makefile ---- tintorig/Makefile 2005-07-17 05:30:54.000000000 -0600 -+++ tint/Makefile 2010-08-23 18:06:24.671875000 -0600 -@@ -28,6 +28,65 @@ - # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -+$(if $(wildcard .xcompile),,$(eval $(shell bash ./xcompile.sh &> .xcompile))) -+include .xcompile -+ -+LIBCONFIG_PATH := ../libpayload -+LIBPAYLOAD_DIR := ./libpayloadbin -+LPCC := $(LIBPAYLOAD_DIR)/libpayload/bin/lpgcc -+LPAS := $(LIBPAYLOAD_DIR)/libpayload/bin/lpas -+HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/libpayload/lib/libpayload.a) -+LIB_CONFIG ?= defconfig -+ -+# CFLAGS := -Wall -Werror -Os -+CFLAGS := -Wall -g -Os -+TARGET := tint -+OBJS := $(TARGET).o engine.o io.o utils.o -+ -+# Make is silent per default, but 'make V=1' will show all compiler calls. -+ifneq ($(V),1) -+Q := @ -+endif -+ -+all: $(TARGET).elf -+# printf" CC $(CC)\n" -+ -+$(TARGET).elf: $(OBJS) libpayload -+ $(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n" -+ $(Q)$(LPCC) -o $@ $(OBJS) -+ $(Q)$(OBJCOPY) --only-keep-debug $@ tint.debug -+ $(Q)$(OBJCOPY) --strip-debug $@ -+ $(Q)$(OBJCOPY) --add-gnu-debuglink=tint.debug $@ -+ -+%.o: %.c libpayload -+ $(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n" -+ $(Q)$(LPCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -+ -+%.S.o: %.S libpayload -+ $(Q)printf " LPAS $(subst $(shell pwd)/,,$(@))\n" -+ $(Q)$(LPAS) $(ASFLAGS) --32 -o $@ $< -+ -+ifneq ($(strip $(HAVE_LIBPAYLOAD)),) -+libpayload: -+ $(Q)printf "Found Libpayload $(LIBPAYLOAD_DIR).\n" -+else -+libpayload: -+ $(Q)printf "Building libpayload @ $(LIBCONFIG_PATH).\n" -+ $(Q)make -C $(LIBCONFIG_PATH) distclean -+ $(Q)make -C $(LIBCONFIG_PATH) $(LIB_CONFIG) -+ $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install -+endif -+ -+clean: -+ $(Q)rm -f $(TARGET).elf $(TARGET).debug *.o -+ $(Q)rm .xcompile -+ -+distclean: clean -+ $(Q)rm -rf $(LIBPAYLOAD_DIR) -+ -+# Original tint targets -+ifdef $(UNUSED) -+ - #CROSS = arm-linux- - - bindir = $(DESTDIR)/usr/games -@@ -110,3 +169,4 @@ clean: - distclean: clean - $(MAKE) -C debian clean - -+endif -diff -rupN tintorig/config.h tint/config.h ---- tintorig/config.h 2001-12-07 16:03:24.000000000 -0700 -+++ tint/config.h 2010-01-27 13:59:18.000000000 -0700 +diff -rupN tint-0.03b/config.h tint/config.h +--- tint-0.03b/config.h 2001-12-08 00:03:24.000000000 +0100 ++++ tint/config.h 2016-05-27 14:47:15.797402090 +0200 @@ -29,7 +29,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -102,10 +18,440 @@ diff -rupN tintorig/config.h tint/config.h +#endif #endif /* #ifndef CONFIG_H */ -diff -rupN tintorig/engine.c tint/engine.c ---- tintorig/engine.c 2005-07-17 05:26:22.000000000 -0600 -+++ tint/engine.c 2010-01-27 13:59:18.000000000 -0700 -@@ -27,8 +27,12 @@ +diff -rupN tint-0.03b/debian/changelog tint/debian/changelog +--- tint-0.03b/debian/changelog 2005-07-17 13:32:20.000000000 +0200 ++++ tint/debian/changelog 1970-01-01 01:00:00.000000000 +0100 +@@ -1,53 +0,0 @@ +-tint (0.03b) unstable; urgency=low +- +- * Added breaks at end of switch statements to keep gcc 3+ happy +- (Closes: #316022) +- * Added missing includes to engine.c +- * Fixed spelling mistake in NOTES +- * Updated debian policy version +- +- -- Abraham van der Merwe <abz(a)debian.org> Sun, 17 Jul 2005 13:32:17 +0200 +- +-tint (0.03a) unstable; urgency=low +- +- * Applied patch with some minor tweaks from Marcello Mamino which +- adds a dotted background. +- * Applied patches from Robert Lemmen which add support for user logins as +- default name and an interactive mode for specifying the start level. +- * Show player statistics. +- +- -- Abraham van der Merwe <abz(a)debian.org> Mon, 16 Jun 2003 23:07:37 +0200 +- +-tint (0.02d) unstable; urgency=low +- +- * Install man page in correct directory (Closes: #128923) +- * Created a postinst program that checks for old score files +- before installing the default score file (Closes: #136466) +- * Added a menu control file (Closes: #128924) +- +- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 +- +-tint (0.02c) unstable; urgency=low +- +- * Removed common-sense suggests from control file *g* (Closes: #123204) +- +- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 +- +-tint (0.02b) unstable; urgency=low +- +- * Changed the name from tclassic to tint (as in TINT Is Not Tetris(tm)) +- * Added a build dependancy on libncurses5-dev (Closes: #124241) +- * Changed the location for the score file to /var/games (Closes: #124236) +- * Made score file sgid games (Closes: #123595) +- +- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 +- +-tclassic (0.02a) unstable; urgency=low +- +- * Initial Release. (Closes: #122839) +- +- -- Abraham van der Merwe <abz(a)debian.org> Fri, 7 Dec 2001 17:59:25 +0200 +- +-Local variables: +-mode: debian-changelog +-End: +diff -rupN tint-0.03b/debian/control tint/debian/control +--- tint-0.03b/debian/control 2005-07-17 13:31:13.000000000 +0200 ++++ tint/debian/control 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +-Source: tint +-Section: games +-Priority: optional +-Maintainer: Abraham van der Merwe <abz(a)debian.org> +-Build-Depends: debhelper (>> 3.0.0), libncurses5-dev +-Standards-Version: 3.6.1 +- +-Package: tint +-Architecture: any +-Depends: ${shlibs:Depends} +-Replaces: tclassic +-Conflicts: tclassic +-Description: TINT Is Not Tetris(tm) ...at least the name isn't +- As the title suggests, this is a clone of the original tetris game +- written by Alexey Pajitnov, Dmitry Pavlovsky, and Vadim Gerasimov. +- . +- I've tried to keep the game as close to the original as possible, but +- there is a few differences. Nevertheless, it's probably the closest to +- the original that you'll ever find in the UNIX world... +diff -rupN tint-0.03b/debian/copyright tint/debian/copyright +--- tint-0.03b/debian/copyright 2001-12-19 17:08:42.000000000 +0100 ++++ tint/debian/copyright 1970-01-01 01:00:00.000000000 +0100 +@@ -1,39 +0,0 @@ +-This is the Debian GNU/Linux prepackaged version of tint. These +-files were written and packaged by Abraham van der Merwe <abz(a)debian.org> +- +-The games is released under a derivative of the BSD license. For more +-information see http://www.opensource.org/licenses/bsd-license.html +- +-The original source can be found at: http://oasis.frogfoot.net +- +-Copyright: +- +- Copyright (c) Abraham vd Merwe <abz(a)blio.net> +- All rights reserved. +- +- Redistribution and use in source and binary forms, with or without +- modification, are permitted provided that the following conditions +- are met: +- +- 1. Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- +- 2. Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in the +- documentation and/or other materials provided with the distribution. +- +- 3. Neither the name of the author nor the names of other contributors +- may be used to endorse or promote products derived from this software +- without specific prior written permission. +- +- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- +diff -rupN tint-0.03b/debian/.depends tint/debian/.depends +--- tint-0.03b/debian/.depends 2002-03-16 17:26:42.000000000 +0100 ++++ tint/debian/.depends 1970-01-01 01:00:00.000000000 +0100 +@@ -1 +0,0 @@ +-tint.postinst.o: tint.postinst.c +diff -rupN tint-0.03b/debian/dirs tint/debian/dirs +--- tint-0.03b/debian/dirs 2002-03-16 17:58:42.000000000 +0100 ++++ tint/debian/dirs 1970-01-01 01:00:00.000000000 +0100 +@@ -1,2 +0,0 @@ +-usr/games +-usr/share/man/man6 +diff -rupN tint-0.03b/debian/docs tint/debian/docs +--- tint-0.03b/debian/docs 2001-12-07 17:25:17.000000000 +0100 ++++ tint/debian/docs 1970-01-01 01:00:00.000000000 +0100 +@@ -1,2 +0,0 @@ +-NOTES +-CREDITS +diff -rupN tint-0.03b/debian/Makefile tint/debian/Makefile +--- tint-0.03b/debian/Makefile 2002-03-16 18:41:18.000000000 +0100 ++++ tint/debian/Makefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,28 +0,0 @@ +- +-# -*- sh -*- +- +-# Written by Abraham van der Merwe <abz(a)blio.net> +-# Last updated: 2002-03-26 +- +-CC = gcc +-CFLAGS = -Wall -Os -pipe +-LDFLAGS = -s +- +-STRIP = strip +-STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment +- +-OBJ = +-SRC = $(OBJ:%.o=%.c) +-PRG = +- +-all: #$(PRG) +- +-$(PRG): $(OBJ) +- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) +- +-clean: +- rm -rf tint +- rm -f *~ $(OBJ) $(PRG) *.substvars *.debhelper +- +-.PHONY: all clean +- +diff -rupN tint-0.03b/debian/menu tint/debian/menu +--- tint-0.03b/debian/menu 2002-03-16 18:31:13.000000000 +0100 ++++ tint/debian/menu 1970-01-01 01:00:00.000000000 +0100 +@@ -1,4 +0,0 @@ +-?package(tint):needs="text" section="Games/Tetris-like" \ +- title="TINT Is Not Tetris(tm)" \ +- command="sh -c '/usr/games/tint -l 5;echo;echo PRESS ENTER;read line'" \ +- hints="Text" +diff -rupN tint-0.03b/debian/postinst tint/debian/postinst +--- tint-0.03b/debian/postinst 2002-03-16 18:44:34.000000000 +0100 ++++ tint/debian/postinst 1970-01-01 01:00:00.000000000 +0100 +@@ -1,13 +0,0 @@ +-#!/bin/sh -e +- +-scorefile="/var/games/tint.scores" +- +-if [ ! -e $scorefile ] +-then +- touch $scorefile +- chmod 0664 $scorefile +- chown root:games $scorefile +-fi +- +-#DEBHELPER# +- +diff -rupN tint-0.03b/debian/postinst.c tint/debian/postinst.c +--- tint-0.03b/debian/postinst.c 2002-03-16 18:15:32.000000000 +0100 ++++ tint/debian/postinst.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,143 +0,0 @@ +- +-/* +- * Hacked up postinst program to install the default score file. We have to do it this +- * way, since the old score file is overwritten if the score file already exists in the +- * package - abz +- */ +- +-#include <sys/types.h> +-#include <sys/stat.h> +-#include <unistd.h> +-#include <fcntl.h> +-#include <pwd.h> +-#include <grp.h> +-#include <inttypes.h> +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> +- +-/* location of score file */ +-static const char filename[] = "/var/games/tint.scores"; +- +-/* user name of default score file */ +-static const char user[] = "root"; +- +-/* group name of default score file */ +-static const char group[] = "games"; +- +-/* contents of default score file */ +-static const uint8_t contents[] = +-{ +- 0x54, 0x69, 0x6e, 0x74, 0x20, 0x30, 0x2e, 0x30, +- 0x32, 0x62, 0x20, 0x28, 0x63, 0x29, 0x20, 0x41, +- 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x20, 0x76, +- 0x64, 0x20, 0x4d, 0x65, 0x72, 0x77, 0x65, 0x20, +- 0x2d, 0x20, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, +- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, +- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, +- 0x74, 0x00, 0x10, 0x5f, 0x00, 0x00, 0xb7, 0xc8, +- 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00, 0x80, 0x3a, +- 0x00, 0x00, 0x94, 0xc5, 0x20, 0x3c, 0x52, 0x69, +- 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65, +- 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, 0x74, 0x00, +- 0x66, 0x21, 0x00, 0x00, 0x31, 0xc9, 0x20, 0x3c, +- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, +- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, +- 0x74, 0x00, 0xdc, 0x1a, 0x00, 0x00, 0x79, 0xc6, +- 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, +- 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, +- 0x63, 0x68, 0x74, 0x00, 0x2f, 0x16, 0x00, 0x00, +- 0xf9, 0xc5, 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61, +- 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62, +- 0x72, 0x65, 0x63, 0x68, 0x74, 0x00, 0x8b, 0x11, +- 0x00, 0x00, 0x82, 0xc7, 0x20, 0x3c, 0x41, 0x62, +- 0x7a, 0x00, 0x23, 0x10, 0x00, 0x00, 0xa9, 0xc9, +- 0x20, 0x3c, 0x44, 0x6f, 0x70, 0x70, 0x65, 0x6c, +- 0x67, 0x61, 0x6e, 0x67, 0x65, 0x72, 0x00, 0x13, +- 0x0b, 0x00, 0x00, 0x21, 0xc7, 0x20, 0x3c, 0x4a, +- 0x6f, 0x68, 0x61, 0x6e, 0x6e, 0x20, 0x42, 0x6f, +- 0x74, 0x68, 0x61, 0x00, 0x5a, 0x09, 0x00, 0x00, +- 0xef, 0xc6, 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00, +- 0xd7, 0x07, 0x00, 0x00, 0xad, 0xc6, 0x20, 0x3c +-}; +- +-static void debhelper_stuff() +-{ +- /* dh_installdocs */ +- system ("if [ -d /usr/doc -a ! -e /usr/doc/tint -a -d /usr/share/doc/tint ]; then\n" +- " ln -sf ../share/doc/tint /usr/doc/tint\n" +- "fi\n"); +- +- /* dh_installmenu */ +- system ("if [ -x /usr/bin/update-menus ]; then update-menus ; fi"); +-} +- +-int main (int argc,char *argv[]) +-{ +- struct stat sb; +- +- /* we only do something if we're called as <program> configure ... */ +- if (argc < 2 || strcmp (argv[1],"configure")) exit (EXIT_SUCCESS); +- +- /* if the score file doesn't exist, create it */ +- if (stat (filename,&sb) < 0) +- { +- int fd,result; +- struct passwd *u; +- struct group *g; +- uid_t uid; +- gid_t gid; +- +- /* get uid */ +- if ((u = getpwnam (user)) == NULL) +- { +- fprintf (stderr,"Couldn't obtain uid for %s: %m\n",user); +- exit (EXIT_FAILURE); +- } +- uid = u->pw_uid; +- +- /* get gid */ +- if ((g = getgrnam (group)) == NULL) +- { +- fprintf (stderr,"Couldn't obtain gid for %s: %m\n",group); +- exit (EXIT_FAILURE); +- } +- gid = g->gr_gid; +- +- /* create default score file */ +- if ((fd = creat (filename,0664)) < 0) +- { +- fprintf (stderr,"Couldn't create score file %s: %m\n",filename); +- exit (EXIT_FAILURE); +- } +- result = write (fd,contents,sizeof (contents)); +- if (result < 0) +- { +- fprintf (stderr,"Unable to write to %s: %m\n",filename); +- close (fd); +- unlink (filename); +- exit (EXIT_FAILURE); +- } +- if (result < sizeof (contents)) +- { +- fprintf (stderr,"Short write count. %d/%d bytes written to %s\n",result,sizeof (contents),filename); +- close (fd); +- unlink (filename); +- exit (EXIT_FAILURE); +- } +- close (fd); +- +- /* change ownership of score file */ +- if (chown (filename,uid,gid) < 0) +- { +- fprintf (stderr,"Couldn't change ownership of %s to %s:%s: %m\n",filename,user,group); +- unlink (filename); +- exit (EXIT_FAILURE); +- } +- } +- +- debhelper_stuff (); +- +- exit (EXIT_SUCCESS); +-} +- +diff -rupN tint-0.03b/debian/rules tint/debian/rules +--- tint-0.03b/debian/rules 2002-03-16 18:00:11.000000000 +0100 ++++ tint/debian/rules 1970-01-01 01:00:00.000000000 +0100 +@@ -1,82 +0,0 @@ +-#!/usr/bin/make -f +- +-# -*- sh -*- +- +-# Uncomment this to turn on verbose mode. +-export DH_VERBOSE=1 +- +-# This is the debhelper compatability version to use. +-export DH_COMPAT=3 +- +-configure: configure-stamp +-configure-stamp: +- dh_testdir +- # Add here commands to configure the package. +- +- +- touch configure-stamp +- +-build: configure-stamp build-stamp +-build-stamp: +- dh_testdir +- +- # Add here commands to compile the package. +- $(MAKE) +- +- touch build-stamp +- +-clean: +- dh_testdir +- dh_testroot +- rm -f build-stamp configure-stamp +- +- # Add here commands to clean up after the build process. +- -$(MAKE) clean +- +- dh_clean +- +-install: build +- dh_testdir +- dh_testroot +- dh_clean -k +- dh_installdirs +- +- # Add here commands to install the package into debian/tint. +- $(MAKE) install DESTDIR=$(CURDIR)/debian/tint +- +-# Build architecture-independent files here. +-binary-indep: build install +-# We have nothing to do by default. +- +-# Build architecture-dependent files here. +-binary-arch: build install +- dh_testdir +- dh_testroot +-# dh_installdebconf +- dh_installdocs +-# dh_installexamples +- dh_installmenu +-# dh_installlogrotate +-# dh_installemacsen +-# dh_installpam +-# dh_installmime +-# dh_installinit +-# dh_installcron +- dh_installman +-# dh_installinfo +-# dh_undocumented +- dh_installchangelogs +- dh_link +- dh_strip +- dh_compress +-# dh_fixperms --exclude /usr/games/tint +-# dh_makeshlibs +- dh_installdeb +-# dh_perl +- dh_shlibdeps +- dh_gencontrol +- dh_md5sums +- dh_builddeb +- +-binary: binary-indep binary-arch +-.PHONY: build clean binary-indep binary-arch binary install configure +diff -rupN tint-0.03b/engine.c tint/engine.c +--- tint-0.03b/engine.c 2005-07-17 13:26:22.000000000 +0200 ++++ tint/engine.c 2016-05-27 19:05:21.681035752 +0200 +@@ -27,10 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -116,11 +462,25 @@ diff -rupN tintorig/engine.c tint/engine.c #include <string.h> +#endif - #include "typedefs.h" +-#include "typedefs.h" #include "utils.h" -diff -rupN tintorig/io.c tint/io.c ---- tintorig/io.c 2001-12-07 08:48:20.000000000 -0700 -+++ tint/io.c 2010-01-27 13:59:18.000000000 -0700 + #include "io.h" + #include "engine.h" +diff -rupN tint-0.03b/engine.h tint/engine.h +--- tint-0.03b/engine.h 2001-12-07 16:48:08.000000000 +0100 ++++ tint/engine.h 2016-05-27 19:04:32.456828081 +0200 +@@ -29,7 +29,7 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include "typedefs.h" /* bool */ ++#include "curses.h" /* bool */ + + /* + * Macros +diff -rupN tint-0.03b/io.c tint/io.c +--- tint-0.03b/io.c 2001-12-07 16:48:20.000000000 +0100 ++++ tint/io.c 2016-05-27 14:47:15.798402053 +0200 @@ -27,9 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -173,9 +533,166 @@ diff -rupN tintorig/io.c tint/io.c return ch; } -diff -rupN tintorig/tint.c tint/tint.c ---- tintorig/tint.c 2005-07-17 05:26:43.000000000 -0600 -+++ tint/tint.c 2010-08-23 18:13:53.281250000 -0600 +diff -rupN tint-0.03b/Makefile tint/Makefile +--- tint-0.03b/Makefile 2005-07-17 13:30:54.000000000 +0200 ++++ tint/Makefile 2016-05-27 21:04:02.374391088 +0200 +@@ -28,85 +28,79 @@ + # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-#CROSS = arm-linux- +- +-bindir = $(DESTDIR)/usr/games +-mandir = $(DESTDIR)/usr/share/man +-localstatedir = $(DESTDIR)/var/games +- +-ifeq ($(CC),) +-CC = gcc +-else +-ifeq ($(CC),colorgcc) +- ifneq ($(CROSS),) +- CC = gcc +- endif ++# in addition to the dependency below, create the file if it doesn't exist ++# to silence warnings about a file that would be generated anyway. ++$(if $(wildcard .xcompile),,$(eval $(shell ../../../../util/xcompile/xcompile $(XGCCPATH) > .xcompile || rm -f .xcompile))) ++.xcompile: ../../../../util/xcompile/xcompile ++ ++CONFIG_COMPILER_GCC := y ++ARCH-y := x86_32 ++ ++include .xcompile ++ ++src := $(CURDIR) ++srctree := $(src) ++tint_obj := $(src)/build ++ ++LIBCONFIG_PATH := $(realpath ../../../libpayload) ++LIBPAYLOAD_DIR := $(tint_obj)/libpayload ++HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a) ++LIB_CONFIG ?= configs/defconfig-tinycurses ++ ++# CFLAGS := -Wall -Werror -Os ++CFLAGS := -Wall -g -Os ++TARGET := tint ++OBJS := $(TARGET).o engine.o io.o utils.o ++ ++ARCH-y := x86_32 ++ ++CC := $(CC_$(ARCH-y)) ++AS := $(AS_$(ARCH-y)) ++OBJCOPY := $(OBJCOPY_$(ARCH-y)) ++ ++LPCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc ++LPAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas ++ ++# Make is silent per default, but 'make V=1' will show all compiler calls. ++ifneq ($(V),1) ++Q := @ + endif +-endif +- +-CFLAGS = -Wall -Os -pipe +-CPPFLAGS = -DSCOREFILE=\"$(localstatedir)/$(PRG).scores\" #-DUSE_RAND +-LDFLAGS = -s +-LDLIBS = -lncurses +- +-STRIP = strip +-STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment +- +-INSTALL = install +- +-OBJ = engine.o utils.o io.o tint.o +-SRC = $(OBJ:%.o=%.c) +-PRG = tint +- +- ########### NOTHING TO EDIT BELOW THIS ########### +- +-.PHONY: all clean do-it-all depend with-depends without-depends debian postinst +- +-all: do-it-all postinst + +-ifeq (.depends,$(wildcard .depends)) +-include .depends +-do-it-all: with-depends ++all: $(TARGET).elf ++# printf" CC $(CC)\n" ++ ++$(TARGET).elf: $(OBJS) libpayload ++ $(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n" ++ $(Q)$(LPCC) -o $@ $(OBJS) ++ $(Q)$(OBJCOPY) --only-keep-debug $@ tint.debug ++ $(Q)$(OBJCOPY) --strip-debug $@ ++ $(Q)$(OBJCOPY) --add-gnu-debuglink=tint.debug $@ ++ ++%.o: %.c libpayload ++ $(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n" ++ $(Q)$(LPCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< ++ ++%.S.o: %.S libpayload ++ $(Q)printf " LPAS $(subst $(shell pwd)/,,$(@))\n" ++ $(Q)$(LPAS) $(ASFLAGS) --32 -o $@ $< ++ ++ifneq ($(strip $(HAVE_LIBPAYLOAD)),) ++libpayload: ++ $(Q)printf "Found Libpayload $(LIBPAYLOAD_DIR).\n" + else +-do-it-all: without-depends +-endif +- +-without-depends: depend with-depends +- +-depend: +- rm -f .depends +- set -e; for F in $(SRC); do $(CC) -MM $(CFLAGS) $(CPPFLAGS) $$F >> .depends; done +- +-with-depends: $(PRG) +- +-$(PRG): $(OBJ) +- $(CROSS)$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) +- $(CROSS)$(STRIP) $(STRIPFLAGS) $@ +- +-ifneq ($(DESTDIR),) +-install: $(PRG) +- $(INSTALL) -d $(bindir) $(mandir) $(localstatedir) +- $(INSTALL) -s -g games -o root -m 2755 $(PRG) $(bindir) +- $(INSTALL) -g games -o root -m 0644 $(PRG).6 $(mandir)/man6 +-# cp tint.scores $(localstatedir)/$(PRG).scores +-# chown root.games $(localstatedir)/$(PRG).scores +-# chmod 0664 $(localstatedir)/$(PRG).scores +- +-uninstall: +- rm -f $(bindir)/$(PRG) $(mandir)/man6/$(PRG).6 $(localstatedir)/$(PRG).scores ++libpayload: ++ $(Q)printf "Building libpayload @ $(LIBCONFIG_PATH).\n" ++ $(Q)make -C $(LIBCONFIG_PATH) distclean ++ $(Q)make -C $(LIBCONFIG_PATH) defconfig KBUILD_DEFCONFIG=$(LIB_CONFIG) ++ $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(tint_obj) install + endif + +-postinst: +- $(MAKE) -C debian +- +-debian: +- dpkg-buildpackage -rfakeroot -k2B555AEE +- + clean: +- rm -f .depends *~ $(OBJ) $(PRG) {configure,build}-stamp gmon.out a.out +- rm -rf debian/$(PRG) +- rm -f debian/*.{debhelper,substvars} debian/files debian/*~ ++ $(Q)rm -f $(TARGET).elf $(TARGET).debug *.o ++ $(Q)rm .xcompile + + distclean: clean +- $(MAKE) -C debian clean ++ $(Q)rm -rf $(tint_obj) + ++ ++.PHONY: all clean do-it-all depend with-depends without-depends debian postinst +Binary files tint-0.03b/.Makefile.swp and tint/.Makefile.swp differ +diff -rupN tint-0.03b/tint.c tint/tint.c +--- tint-0.03b/tint.c 2005-07-17 13:26:43.000000000 +0200 ++++ tint/tint.c 2016-05-27 18:59:53.838346317 +0200 @@ -1,4 +1,3 @@ - /* @@ -189,15 +706,17 @@ diff -rupN tintorig/tint.c tint/tint.c #include <stdlib.h> #include <stdio.h> #include <string.h> -@@ -34,6 +34,7 @@ +@@ -34,8 +34,8 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> +#endif - #include "typedefs.h" +-#include "typedefs.h" #include "utils.h" -@@ -321,6 +322,7 @@ typedef struct + #include "io.h" + #include "config.h" +@@ -321,6 +321,7 @@ typedef struct time_t timestamp; } score_t; @@ -205,7 +724,7 @@ diff -rupN tintorig/tint.c tint/tint.c static void getname (char *name) { struct passwd *pw = getpwuid (geteuid ()); -@@ -337,7 +339,9 @@ static void getname (char *name) +@@ -337,7 +338,9 @@ static void getname (char *name) name[NAMELEN - 1] = '\0'; } } @@ -215,7 +734,7 @@ diff -rupN tintorig/tint.c tint/tint.c static void err1 () { fprintf (stderr,"Error creating %s\n",scorefile); -@@ -349,10 +353,11 @@ static void err2 () +@@ -349,10 +352,11 @@ static void err2 () fprintf (stderr,"Error writing to %s\n",scorefile); exit (EXIT_FAILURE); } @@ -228,7 +747,7 @@ diff -rupN tintorig/tint.c tint/tint.c "\n\t PLAYER STATISTICS\n\n\t" "Score %11d\n\t" "Efficiency %11d\n\t" -@@ -360,6 +365,7 @@ void showplayerstats (engine_t *engine) +@@ -360,6 +364,7 @@ void showplayerstats (engine_t *engine) GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ()); } @@ -236,7 +755,7 @@ diff -rupN tintorig/tint.c tint/tint.c static void createscores (int score) { FILE *handle; -@@ -394,7 +400,9 @@ static void createscores (int score) +@@ -394,7 +399,9 @@ static void createscores (int score) fprintf (stderr,"%s",scoretitle); fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name); } @@ -246,7 +765,7 @@ diff -rupN tintorig/tint.c tint/tint.c static int cmpscores (const void *a,const void *b) { int result; -@@ -412,7 +420,9 @@ static int cmpscores (const void *a,cons +@@ -412,7 +419,9 @@ static int cmpscores (const void *a,cons /* timestamps is equal */ return 0; } @@ -256,7 +775,7 @@ diff -rupN tintorig/tint.c tint/tint.c static void savescores (int score) { FILE *handle; -@@ -490,11 +500,13 @@ static void savescores (int score) +@@ -490,11 +499,13 @@ static void savescores (int score) } fprintf (stderr,"\n"); } @@ -270,7 +789,7 @@ diff -rupN tintorig/tint.c tint/tint.c static void showhelp () { fprintf (stderr,"USAGE: tint [-h] [-l level] [-n]\n"); -@@ -504,9 +516,11 @@ static void showhelp () +@@ -504,9 +515,11 @@ static void showhelp () fprintf (stderr," -d Draw vertical dotted lines\n"); exit (EXIT_FAILURE); } @@ -282,7 +801,7 @@ diff -rupN tintorig/tint.c tint/tint.c int i = 1; while (i < argc) { -@@ -536,10 +550,12 @@ static void parse_options (int argc,char +@@ -536,10 +549,12 @@ static void parse_options (int argc,char } i++; } @@ -295,7 +814,7 @@ diff -rupN tintorig/tint.c tint/tint.c char buf[NAMELEN]; do -@@ -549,6 +565,8 @@ static void choose_level () +@@ -549,6 +564,8 @@ static void choose_level () buf[strlen (buf) - 1] = '\0'; } while (!str2int (&level,buf) || level < MINLEVEL || level > MAXLEVEL); @@ -304,7 +823,7 @@ diff -rupN tintorig/tint.c tint/tint.c } /***************************************************************************/ -@@ -663,8 +681,15 @@ int main (int argc,char *argv[]) +@@ -663,8 +680,15 @@ int main (int argc,char *argv[]) if (ch != 'q') { showplayerstats (&engine); @@ -320,10 +839,82 @@ diff -rupN tintorig/tint.c tint/tint.c +#endif } -diff -rupN tintorig/utils.c tint/utils.c ---- tintorig/utils.c 2001-12-07 08:49:19.000000000 -0700 -+++ tint/utils.c 2010-01-27 13:59:18.000000000 -0700 -@@ -27,9 +27,13 @@ +diff -rupN tint-0.03b/typedefs.h tint/typedefs.h +--- tint-0.03b/typedefs.h 2001-12-07 16:49:06.000000000 +0100 ++++ tint/typedefs.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,68 +0,0 @@ +-#ifndef TYPEDEFS_H +-#define TYPEDEFS_H +- +-/* +- * Copyright (c) Abraham vd Merwe <abz(a)blio.net> +- * All rights reserved. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 3. Neither the name of the author nor the names of other contributors +- * may be used to endorse or promote products derived from this software +- * without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-/* +- * Boolean definitions +- */ +- +-#ifndef bool +-#define bool int +-#endif +- +-#if !defined(false) || (false != 0) +-#define false 0 +-#endif +- +-#if !defined(true) || (true != 0) +-#define true 1 +-#endif +- +-#if !defined(FALSE) || (FALSE != false) +-#define FALSE false +-#endif +- +-#if !defined(TRUE) || (TRUE != true) +-#define TRUE true +-#endif +- +-/* +- * Error flags +- */ +- +-#if !defined(ERR) || (ERR != -1) +-#define ERR -1 +-#endif +- +-#if !defined(OK) || (OK != 0) +-#define OK 0 +-#endif +- +-#endif /* #ifndef TYPEDEFS_H */ +diff -rupN tint-0.03b/utils.c tint/utils.c +--- tint-0.03b/utils.c 2001-12-07 16:49:19.000000000 +0100 ++++ tint/utils.c 2016-05-27 19:05:40.313351887 +0200 +@@ -27,11 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -333,11 +924,13 @@ diff -rupN tintorig/utils.c tint/utils.c #include <stdlib.h> #include <time.h> #include <limits.h> +- +-#include "typedefs.h" +#endif - #include "typedefs.h" - -@@ -41,8 +45,11 @@ void rand_init () + /* + * Initialize random number generator +@@ -41,8 +43,11 @@ void rand_init () #ifdef USE_RAND srand (time (NULL)); #else @@ -349,7 +942,7 @@ diff -rupN tintorig/utils.c tint/utils.c } /* -@@ -61,6 +68,7 @@ int rand_value (int range) +@@ -61,6 +66,7 @@ int rand_value (int range) * Convert an str to long. Returns TRUE if successful, * FALSE otherwise. */ @@ -357,88 +950,20 @@ diff -rupN tintorig/utils.c tint/utils.c bool str2int (int *i,const char *str) { char *endptr; -@@ -69,3 +77,4 @@ bool str2int (int *i,const char *str) +@@ -69,3 +75,4 @@ bool str2int (int *i,const char *str) return TRUE; } +#endif -diff -rupN tintorig/xcompile.sh tint/xcompile.sh ---- tintorig/xcompile.sh 1969-12-31 17:00:00.000000000 -0700 -+++ tint/xcompile.sh 2010-03-10 15:34:51.421875000 -0700 -@@ -0,0 +1,76 @@ -+#!/bin/bash -+ -+CONFIG=defconfig -+SCRIPT_DIR=`dirname "$0"` -+ -+for make in make gmake gnumake; do -+ if [ "`$make --version 2>/dev/null | grep -c GNU`" -gt 0 ]; then -+ MAKE=$make -+ break -+ fi -+done -+ -+GCCPREFIX=invalid -+for gccprefixes in `pwd`/$SCRIPT_DIR/../../util/crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do -+ TMP=`mktemp /tmp/temp.XXXX` -+ echo "mov %eax, %eax" > ${TMP}.s -+ printf "\x7fELF" > ${TMP}.compare -+ if which ${gccprefixes}as 2>/dev/null >/dev/null; then -+ printf "" -+ else -+ continue -+ fi -+ if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}.s; then -+ dd bs=4 count=1 if=${TMP}.o > ${TMP}.test 2>/dev/null -+ if cmp ${TMP}.test ${TMP}.compare; then -+ GCCPREFIX=$gccprefixes -+ rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test -+ break -+ fi -+ fi -+ rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test -+done -+ -+if [ "$GCCPREFIX" = "invalid" ]; then -+ echo no suitable gcc found -+ exit 1 -+fi -+ -+#MAKEFLAGS=" \ -+# AS=\"${GCCPREFIX}as --32\" \ -+# CC=\"${GCCPREFIX}gcc -m32\" \ -+# AR=\"${GCCPREFIX}ar\" \ -+# LD=\"${GCCPREFIX}ld -b elf32-i386\" \ -+# STRIP=\"${GCCPREFIX}strip\" \ -+# NM=\"${GCCPREFIX}nm\" \ -+# HOSTCC=gcc \ -+# -j \ -+#" -+ -+cat << afteroptions -+export AS:=${GCCPREFIX}as --32 -+export CC:=${GCCPREFIX}gcc -m32 -+export CPP:=${GCCPREFIX}cpp -+export AR:=${GCCPREFIX}ar -+export LD:=${GCCPREFIX}ld -b elf32-i386 -+export STRIP:=${GCCPREFIX}strip -+export NM:=${GCCPREFIX}nm -+export OBJCOPY:=${GCCPREFIX}objcopy -+export OBJDUMP:=${GCCPREFIX}objdump -+export HOSTCC:=gcc -+afteroptions -+ -+# Should we let the payload build libpayload or do it for them? -+#test -d ./build || ( -+# BUILDDIR=$PWD -+# cd ../libpayload -+# $MAKE distclean -+# cp configs/$CONFIG .config -+# $MAKE oldconfig -+# eval $MAKE $MAKEFLAGS -+# eval $MAKE $MAKEFLAGS DESTDIR=$BUILDDIR/build install -+# cd .. -+#) -+ -+# eval $MAKE -C $SCRIPT_DIR $MAKEFLAGS -+ +diff -rupN tint-0.03b/utils.h tint/utils.h +--- tint-0.03b/utils.h 2001-12-07 16:49:35.000000000 +0100 ++++ tint/utils.h 2016-05-27 19:00:34.120754123 +0200 +@@ -29,7 +29,7 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include "typedefs.h" ++#include <curses.h> + + /* + * Initialize random number generator

1 0

Patch merged into coreboot/master: soc/intel/apollolake: provide SMM dependency requirements
by gerrit＠coreboot.org 27 May '16

27 May '16

the following patch was just integrated into master: commit b3f5418ec16b1c0cdc913d0afd49bde94c26728e Author: Aaron Durbin <adurbin(a)chromium.org> Date: Thu May 26 14:22:34 2016 -0500 soc/intel/apollolake: provide SMM dependency requirements Depending on which options are selected there needs to be certain functions supplied. However, the spi, mmap_boot, and tsc_freq modules were not included in the SMM builds. Fix the omission. Change-Id: I25ab42886cfd46770ce0f4beee65f2f4d15649f3 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://review.coreboot.org/14977 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan(a)google.com> See https://review.coreboot.org/14977 for details. -gerrit

1 0

Patch merged into coreboot/master: mainboard/google/reef: increase BIOS region size
by gerrit＠coreboot.org 27 May '16

27 May '16

the following patch was just integrated into master: commit 07dd474d658545b6b284195e7a003c6fe8ca8c44 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Thu May 26 12:01:19 2016 -0500 mainboard/google/reef: increase BIOS region size An updated descriptor expands the BIOS region while descreasing the 'device expansion region' utilized by the CSE. Update the end region marker to reflect this new size as well as the chromeos.fmd file which needs to be adjusted for logical boot parition 2 requirement which resides halfway through the BIOS region. The GBB was moved and shunk to accommodate the change. Change-Id: I7baa5282d7c608af648b5773c4dfa123060a6e45 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://review.coreboot.org/14974 Reviewed-by: Furquan Shaikh <furquan(a)google.com> Tested-by: build bot (Jenkins) See https://review.coreboot.org/14974 for details. -gerrit

1 0

Patch merged into coreboot/master: google/reef: Sync chromeos.fmd with fmap.dts and fix offsets
by gerrit＠coreboot.org 27 May '16

27 May '16

the following patch was just integrated into master: commit 2b56ba5a4f90322a42802957aab3492db049a202 Author: Furquan Shaikh <furquan(a)google.com> Date: Wed May 25 17:04:55 2016 -0700 google/reef: Sync chromeos.fmd with fmap.dts and fix offsets CQ-DEPEND=CL:347460 BUG=chrome-os-partner:53689 BRANCH=None TEST="emerge-reef chromeos-bootimage" completes without error Change-Id: Ic954e29628423937604772a8d2d0414954e6ba3e Signed-off-by: Furquan Shaikh <furquan(a)google.com> Reviewed-on: https://chromium-review.googlesource.com/347441 Commit-Ready: Furquan Shaikh <furquan(a)chromium.org> Tested-by: Furquan Shaikh <furquan(a)chromium.org> Reviewed-by: Furquan Shaikh <furquan(a)chromium.org> Reviewed-on: https://review.coreboot.org/14975 Tested-by: build bot (Jenkins) See https://review.coreboot.org/14975 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2016