From 8c656f4db4de389b493ea332477059a37ef2dee7 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Thu, 4 Aug 2022 17:52:08 +0300 Subject: Improve squashfs compression; remove unneeded staff --- meta-ibs/conf/machine/include/ibs.inc | 1 + .../conf/machine/include/obmc-bsp-sila-common.inc | 2 +- .../conf/machine/include/sila-ast2500-64mb.inc | 24 - .../linux-aspeed/aspeed-bmc-sila-cp2-5422-64mb.dts | 537 --------------------- .../linux-aspeed/openbmc-flash-layout-64MB.dtsi | 33 -- 5 files changed, 2 insertions(+), 595 deletions(-) delete mode 100644 meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc delete mode 100644 meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422-64mb.dts delete mode 100644 meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi diff --git a/meta-ibs/conf/machine/include/ibs.inc b/meta-ibs/conf/machine/include/ibs.inc index 238dff337b..8c6d8b18c4 100644 --- a/meta-ibs/conf/machine/include/ibs.inc +++ b/meta-ibs/conf/machine/include/ibs.inc @@ -13,6 +13,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-discover-system-state ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ibs-apps" diff --git a/meta-ibs/meta-ast2500/conf/machine/include/obmc-bsp-sila-common.inc b/meta-ibs/meta-ast2500/conf/machine/include/obmc-bsp-sila-common.inc index 419d47bfa9..335bdc9307 100644 --- a/meta-ibs/meta-ast2500/conf/machine/include/obmc-bsp-sila-common.inc +++ b/meta-ibs/meta-ast2500/conf/machine/include/obmc-bsp-sila-common.inc @@ -3,7 +3,7 @@ #@DESCRIPTION: Common machine configuration for OpenBMC chips IMAGE_FSTYPES += "squashfs-xz" -EXTRA_IMAGECMD:squashfs-xz:append = "-processors ${BB_NUMBER_THREADS} -b 262144 -Xdict-size 100% -Xbcj arm" +EXTRA_IMAGECMD:squashfs-xz:append = "-processors ${BB_NUMBER_THREADS} -b 1048576 -Xdict-size 100% -Xbcj arm" IMAGE_CLASSES += "image_types qemuboot" diff --git a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc b/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc deleted file mode 100644 index 778f2b63d7..0000000000 --- a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc +++ /dev/null @@ -1,24 +0,0 @@ - -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-${FACTORY}-${MACHINE}.dtb" - -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" -PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" -PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" - -UBOOT_MACHINE = "ast_g5_phy_config" - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibs.inc - -include conf/machine/include/obmc-bsp-sila-common.inc - -SERIAL_CONSOLES = "115200;ttyS3 115200;ttyS4" - -FLASH_SIZE = "65536" -FLASH_KERNEL_OFFSET:flash-65536 = "512" -FLASH_ROFS_OFFSET:flash-65536 = "9216" -FLASH_RWFS_OFFSET:flash-65536 = "49152" - -IMAGE_FEATURES += "allow-root-login" diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422-64mb.dts b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422-64mb.dts deleted file mode 100644 index 7bc45260cc..0000000000 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422-64mb.dts +++ /dev/null @@ -1,537 +0,0 @@ -/dts-v1/; - -#include "aspeed-g5.dtsi" -#include -#include - -/ { - model = "CP2-5422 BMC"; - compatible = "sila,cp2-5422-bmc", "aspeed,ast2500"; - - aliases { - serial4 = &uart5; - serial5 = &vuart; - }; - - chosen { - stdout-path = &uart5; - bootargs = "console=ttyS4,115200 earlyprintk"; - }; - - memory@80000000 { - reg = <0x80000000 0x20000000>; - }; - - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - vga_memory: framebuffer@7f000000 { - no-map; - phandle = <0xf6>; - reg = <0x7f000000 0x01000000>; /* 16M */ - }; - - gfx_memory: framebuffer { - reusable; - compatible = "shared-dma-pool"; - alignment = <0x01000000>; - size = <0x01000000>; - phandle = <0x0a>; - }; - - video_engine_memory: jpegbuffer { - reusable; - compatible = "shared-dma-pool"; - alignment = <0x01000000>; - size = <0x02000000>; /* 32M */ - phandle = <0x0d>; - }; - - ramoops@9eff0000{ - compatible = "ramoops"; - record-size = <0x2000>; - console-size = <0x2000>; - reg = <0x9eff0000 0x10000>; - }; - }; - - vga-shared-memory { - compatible = "aspeed,ast2500-vga-sharedmem"; - reg = <0x9ff00000 0x100000>; - }; - - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, - <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, - <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>, - <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>; - }; - - leds { - compatible = "gpio-leds"; - - identify { - default-state = "off"; - gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; - }; - - status_amber { - default-state = "off"; - gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; - }; - - status_green { - default-state = "keep"; - gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; - }; - - cpu0fault { - default-state = "off"; - gpios = <&gpio ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>; - }; - - cpu1fault { - default-state = "off"; - gpios = <&gpio ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>; - }; - }; - - beeper { - compatible = "pwm-beeper"; - pwms = <&timer 6 1000000 0>; - }; -}; - -&fmc { - status = "okay"; - flash@0 { - status = "okay"; - m25p,fast-read; - label = "bmc"; -#include "openbmc-flash-layout-64MB.dtsi" - }; -}; - -&espi { - status = "okay"; -}; - -&jtag { - status = "okay"; -}; - -&peci0 { - status = "okay"; - gpios = <&gpio ASPEED_GPIO(F, 6) 0>; -}; - -&syscon { - uart-clock-high-speed; - status = "okay"; - - misc_control { - compatible = "aspeed,bmc-misc"; - uart_port_debug { - offset = <0x2c>; - bit-mask = <0x1>; - bit-shift = <10>; - read-only; - }; - p2a-bridge { - offset = <0x180>; - bit-mask = <0x1>; - bit-shift = <1>; - read-only; - }; - boot-2nd-flash { - offset = <0x70>; - bit-mask = <0x1>; - bit-shift = <17>; - read-only; - }; - chip_id { - offset = <0x150>; - bit-mask = <0x0fffffff 0xffffffff>; - bit-shift = <0>; - read-only; - reg-width = <64>; - hash-data = "d44f9b804976fa23c2e25d62f16154d26520a7e24c5555095fd1b55c027804f1570dcd16189739c640cd7d9a6ce14944a2c4eaf1dc429eed6940e8a83498a474"; - }; - silicon_id { - offset = <0x7c>; - bit-mask = <0xffffffff>; - bit-shift = <0>; - read-only; - reg-width = <32>; - }; - }; -}; - -&adc { - status = "okay"; -}; - -&gpio { - status = "okay"; - /* Enable GPIOE0 and GPIOE2 pass-through by default */ - pinctrl-names = "pass-through"; - pinctrl-0 = <&pinctrl_gpie0_default - &pinctrl_gpie2_default>; - gpio-line-names = - /*A0-A7*/ "","","","","","","","", - /*B0-B7*/ "","","","","","","","", - /*C0-C7*/ "","","","","","","","", - /*D0-D7*/ "","","","","","","","", - /*E0-E7*/ "RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","", - /*F0-F7*/ "NMI_OUT","","","","CPU_ERR0","CPU_ERR1","","", - /*G0-G7*/ "CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","LCP_ENTER_BUTTON","LCP_LEFT_BUTTON","FM_BMC_BOARD_SKU_ID5_N","","", - /*H0-H7*/ "","","","FM_NODE_ID_1","FM_NODE_ID_2","FM_NODE_ID_3","FM_NODE_ID_4","FM_240VA_STATUS", - /*I0-I7*/ "FM_SYS_FAN0_PRSNT_D_N","FM_SYS_FAN1_PRSNT_D_N","FM_SYS_FAN2_PRSNT_D_N","FM_SYS_FAN3_PRSNT_D_N","FM_SYS_FAN4_PRSNT_D_N","FM_SYS_FAN5_PRSNT_D_N","","", - /*J0-J7*/ "","","","","","","","", - /*K0-K7*/ "","","","","","","","", - /*L0-L7*/ "","","","","","","","", - /*M0-M7*/ "","","","","","","","", - /*N0-N7*/ "","","","","","","","", - /*O0-O7*/ "","","","","","","","", - /*P0-P7*/ "","","","","","","","", - /*Q0-Q7*/ "","","","","","","","PWR_DEBUG_N", - /*R0-R7*/ "","XDP_PRST_N","","","","","","CHASSIS_INTRUSION", - /*S0-S7*/ "REMOTE_DEBUG_ENABLE","SYSPWROK","RSMRST_N","","","","","", - /*T0-T7*/ "","","","","","","","", - /*U0-U7*/ "","","","","","","","", - /*V0-V7*/ "","","","","","","","", - /*W0-W7*/ "","","","","","","","", - /*X0-X7*/ "","","","","","","","", - /*Y0-Y7*/ "SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","", - /*Z0-Z7*/ "","SIO_POWER_GOOD","","","","","","", - /*AA0-AA7*/ "P3VBAT_BRIDGE_EN","","","","PREQ_N","TCK_MUX_SEL","SMI","POST_COMPLETE", - /*AB0-AB7*/ "","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","", - /*AC0-AC7*/ "","","","","","","",""; -}; - -&sgpio { - ngpios = <80>; - bus-frequency = <2000000>; - status = "okay"; - /* SGPIO lines. even: input, odd: output */ - gpio-line-names = - /*A0-A7*/ "CPU1_PRESENCE","","CPU1_THERMTRIP","","CPU1_VRHOT","","CPU1_FIVR_FAULT","","CPU1_MEM_ABCD_VRHOT","","CPU1_MEM_EFGH_VRHOT","","","","","", - /*B0-B7*/ "CPU1_MISMATCH","LED_CPU1_CH1_DIMM1_FAULT","CPU1_MEM_THERM_EVENT","LED_CPU1_CH1_DIMM2_FAULT","CPU2_PRESENCE","LED_CPU1_CH2_DIMM1_FAULT","CPU2_THERMTRIP","LED_CPU1_CH2_DIMM2_FAULT","CPU2_VRHOT","LED_CPU1_CH3_DIMM1_FAULT","CPU2_FIVR_FAULT","LED_CPU1_CH3_DIMM2_FAULT","CPU2_MEM_ABCD_VRHOT","LED_CPU1_CH4_DIMM1_FAULT","CPU2_MEM_EFGH_VRHOT","LED_CPU1_CH4_DIMM2_FAULT", - /*C0-C7*/ "","LED_CPU1_CH5_DIMM1_FAULT","","LED_CPU1_CH5_DIMM2_FAULT","CPU2_MISMATCH","LED_CPU1_CH6_DIMM1_FAULT","CPU2_MEM_THERM_EVENT","LED_CPU1_CH6_DIMM2_FAULT","","LED_FAN1_FAULT","","LED_FAN2_FAULT","","LED_FAN3_FAULT","","LED_FAN4_FAULT", - /*D0-D7*/ "","LED_FAN5_FAULT","","LED_FAN6_FAULT","","LED_FAN7_FAULT","","LED_FAN8_FAULT","","LED_CPU2_CH1_DIMM1_FAULT","","LED_CPU2_CH1_DIMM2_FAULT","","LED_CPU2_CH2_DIMM1_FAULT","","LED_CPU2_CH2_DIMM2_FAULT", - /*E0-E7*/ "","LED_CPU2_CH3_DIMM1_FAULT","","LED_CPU2_CH3_DIMM2_FAULT","","LED_CPU2_CH4_DIMM1_FAULT","","LED_CPU2_CH4_DIMM2_FAULT","","LED_CPU2_CH5_DIMM1_FAULT","","LED_CPU2_CH5_DIMM2_FAULT","","LED_CPU2_CH6_DIMM1_FAULT","","LED_CPU2_CH6_DIMM2_FAULT", - /*F0-F7*/ "SGPIO_PLD_MINOR_REV_BIT0","LED_CPU3_CH1_DIMM1_FAULT","SGPIO_PLD_MINOR_REV_BIT1","LED_CPU3_CH1_DIMM2_FAULT","SGPIO_PLD_MINOR_REV_BIT2","LED_CPU3_CH2_DIMM1_FAULT","SGPIO_PLD_MINOR_REV_BIT3","LED_CPU3_CH2_DIMM2_FAULT","SGPIO_PLD_MAJOR_REV_BIT0","LED_CPU3_CH3_DIMM1_FAULT","SGPIO_PLD_MAJOR_REV_BIT1","LED_CPU3_CH3_DIMM2_FAULT","SGPIO_PLD_MAJOR_REV_BIT2","LED_CPU3_CH4_DIMM1_FAULT","SGPIO_PLD_MAJOR_REV_BIT3","LED_CPU3_CH4_DIMM2_FAULT", - /*G0-G7*/ "MAIN_PLD_MINOR_REV_BIT0","LED_CPU3_CH5_DIMM1_FAULT","MAIN_PLD_MINOR_REV_BIT1","LED_CPU3_CH5_DIMM2_FAULT","MAIN_PLD_MINOR_REV_BIT2","LED_CPU3_CH6_DIMM1_FAULT","MAIN_PLD_MINOR_REV_BIT3","LED_CPU3_CH6_DIMM2_FAULT","MAIN_PLD_MAJOR_REV_BIT0","LED_CPU4_CH1_DIMM1_FAULT","MAIN_PLD_MAJOR_REV_BIT1","LED_CPU4_CH1_DIMM2_FAULT","MAIN_PLD_MAJOR_REV_BIT2","LED_CPU4_CH2_DIMM1_FAULT","MAIN_PLD_MAJOR_REV_BIT3","LED_CPU4_CH2_DIMM2_FAULT", - /*H0-H7*/ "","LED_CPU4_CH3_DIMM1_FAULT","","LED_CPU4_CH3_DIMM2_FAULT","","LED_CPU4_CH4_DIMM1_FAULT","","LED_CPU4_CH4_DIMM2_FAULT","","LED_CPU4_CH5_DIMM1_FAULT","","LED_CPU4_CH5_DIMM2_FAULT","","LED_CPU4_CH6_DIMM1_FAULT","","LED_CPU4_CH6_DIMM2_FAULT", - /*I0-I7*/ "","","","","","","","","","","","","","","","", - /*J0-J7*/ "","","","","","","","","","","","","","","",""; -#if 0 - status = "okay"; - gpio-line-names = - /* SGPIO output lines */ - /*OA0-OA7*/ "","","","","","","","", - /*OB0-OB7*/ "LED_CPU1_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU1_CH2_DIMM1_FAULT","LED_CPU1_CH2_DIMM2_FAULT","LED_CPU1_CH3_DIMM1_FAULT","LED_CPU1_CH3_DIMM2_FAULT","LED_CPU1_CH4_DIMM1_FAULT","LED_CPU1_CH4_DIMM2_FAULT", - /*OC0-OC7*/ "LED_CPU1_CH5_DIMM1_FAULT","LED_CPU1_CH5_DIMM2_FAULT","LED_CPU1_CH6_DIMM1_FAULT","LED_CPU1_CH6_DIMM2_FAULT","LED_FAN1_FAULT","LED_FAN2_FAULT","LED_FAN3_FAULT","LED_FAN4_FAULT", - /*OD0-OD7*/ "LED_FAN5_FAULT","LED_FAN6_FAULT","LED_FAN7_FAULT","LED_FAN8_FAULT","LED_CPU2_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU2_CH2_DIMM1_FAULT","LED_CPU2_CH2_DIMM2_FAULT", - /*OE0-OE7*/ "LED_CPU2_CH3_DIMM1_FAULT","LED_CPU2_CH3_DIMM2_FAULT","LED_CPU2_CH4_DIMM1_FAULT","LED_CPU2_CH4_DIMM2_FAULT","LED_CPU2_CH5_DIMM1_FAULT","LED_CPU2_CH5_DIMM2_FAULT","LED_CPU2_CH6_DIMM1_FAULT","LED_CPU2_CH6_DIMM2_FAULT", - /*OF0-OF7*/ "LED_CPU3_CH1_DIMM1_FAULT","LED_CPU3_CH1_DIMM2_FAULT","LED_CPU3_CH2_DIMM1_FAULT","LED_CPU3_CH2_DIMM2_FAULT","LED_CPU3_CH3_DIMM1_FAULT","LED_CPU3_CH3_DIMM2_FAULT","LED_CPU3_CH4_DIMM1_FAULT","LED_CPU3_CH4_DIMM2_FAULT", - /*OG0-OG7*/ "LED_CPU3_CH5_DIMM1_FAULT","LED_CPU3_CH5_DIMM2_FAULT","LED_CPU3_CH6_DIMM1_FAULT","LED_CPU3_CH6_DIMM2_FAULT","LED_CPU4_CH1_DIMM1_FAULT","LED_CPU4_CH1_DIMM2_FAULT","LED_CPU4_CH2_DIMM1_FAULT","LED_CPU4_CH2_DIMM2_FAULT", - /*OH0-OH7*/ "LED_CPU4_CH3_DIMM1_FAULT","LED_CPU4_CH3_DIMM2_FAULT","LED_CPU4_CH4_DIMM1_FAULT","LED_CPU4_CH4_DIMM2_FAULT","LED_CPU4_CH5_DIMM1_FAULT","LED_CPU4_CH5_DIMM2_FAULT","LED_CPU4_CH6_DIMM1_FAULT","LED_CPU4_CH6_DIMM2_FAULT", - /*OI0-OI7*/ "","","","","","","","", - /*OJ0-OJ7*/ "","","","","","","","", - /*DUMMY*/ "","","","","","","","", - /*DUMMY*/ "","","","","","","","", - - /* SGPIO input lines */ - /*IA0-IA7*/ "CPU1_PRESENCE","CPU1_THERMTRIP","CPU1_VRHOT","CPU1_FIVR_FAULT","CPU1_MEM_ABCD_VRHOT","CPU1_MEM_EFGH_VRHOT","","", - /*IB0-IB7*/ "CPU1_MISMATCH","CPU1_MEM_THERM_EVENT","CPU2_PRESENCE","CPU2_THERMTRIP","CPU2_VRHOT","CPU2_FIVR_FAULT","CPU2_MEM_ABCD_VRHOT","CPU2_MEM_EFGH_VRHOT", - /*IC0-IC7*/ "","","CPU2_MISMATCH","CPU2_MEM_THERM_EVENT","","","","", - /*ID0-ID7*/ "","","","","","","","", - /*IE0-IE7*/ "","","","","","","","", - /*IF0-IF7*/ "SGPIO_PLD_MINOR_REV_BIT0","SGPIO_PLD_MINOR_REV_BIT1","SGPIO_PLD_MINOR_REV_BIT2","SGPIO_PLD_MINOR_REV_BIT3","SGPIO_PLD_MAJOR_REV_BIT0","SGPIO_PLD_MAJOR_REV_BIT1","SGPIO_PLD_MAJOR_REV_BIT2","SGPIO_PLD_MAJOR_REV_BIT3", - /*IG0-IG7*/ "MAIN_PLD_MINOR_REV_BIT0","MAIN_PLD_MINOR_REV_BIT1","MAIN_PLD_MINOR_REV_BIT2","MAIN_PLD_MINOR_REV_BIT3","MAIN_PLD_MAJOR_REV_BIT0","MAIN_PLD_MAJOR_REV_BIT1","MAIN_PLD_MAJOR_REV_BIT2","MAIN_PLD_MAJOR_REV_BIT3", - /*IH0-IH7*/ "","","","","","","","", - /*II0-II7*/ "","","","","","","","", - /*IJ0-IJ7*/ "","","","","","","",""; -#endif -}; - -&kcs3 { - aspeed,lpc-io-reg = <0xCA2>; - status = "okay"; -}; - -&kcs4 { - aspeed,lpc-io-reg = <0xCA4>; - status = "okay"; -}; - -&sio_regs { - status = "okay"; - sio_status { - offset = <0x10C>; - bit-mask = <0x1F>; - bit-shift = <4>; - }; -}; - -&lpc_sio { - status = "okay"; -}; - -&lpc_snoop { - snoop-ports = <0x80>; - status = "okay"; -}; - -&mbox { - status = "okay"; -}; - -&uart_routing { - status = "okay"; -}; - -/** - * SAFS through SPI1 is available only on Wilson Point. - * These pins are used as fan presence checking gpios in WFP - * so commenting it out for now. - * &spi1 { - * status = "okay"; - * - * flash@0 { - * m25p,fast-read; - * status = "okay"; - * }; - *}; - */ - -&uart1 { - //Host Console - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_txd1_default - &pinctrl_rxd1_default - &pinctrl_nrts1_default - &pinctrl_ndtr1_default - &pinctrl_ndsr1_default - &pinctrl_ncts1_default - &pinctrl_ndcd1_default - &pinctrl_nri1_default>; -}; - -&uart2 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_txd2_default - &pinctrl_rxd2_default - &pinctrl_nrts2_default - &pinctrl_ndtr2_default - &pinctrl_ndsr2_default - &pinctrl_ncts2_default - &pinctrl_ndcd2_default - &pinctrl_nri2_default>; -}; - -&uart3 { - status = "okay"; -}; - -&uart4 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <>; -}; - -&uart5 { - //BMC Console - status = "okay"; -}; - -&mac1 { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -}; - -&mac0 { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_rmii1_default>; - use-ncsi; -}; - -&i2c0 { - multi-master; - general-call; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c1 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c2 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c3 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; - - rtc-pch@44 { - compatible = "rtc,pchc620"; - reg = <0x44>; - }; -}; - -&i2c4 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c5 { - bus-frequency = <1000000>; - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c6 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c7 { - multi-master; - #retries = <3>; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c9 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c11 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&i2c13 { - multi-master; - aspeed,dma-buf-size = <4095>; - aspeed,hw-timeout-ms = <300>; - status = "okay"; -}; - -&gfx { - status = "okay"; - memory-region = <&gfx_memory>; -}; - -&vuart { - status = "okay"; - - /* We enable the VUART here, but leave it in a state that does - * not interfere with the SuperIO. The goal is to have both the - * VUART and the SuperIO available and decide at runtime whether - * the VUART should actually be used. For that reason, configure - * an "invalid" IO address and an IRQ that is not used by the - * BMC. - */ - aspeed,lpc-io-reg = <0xffff>; - aspeed,lpc-interrupts = <15>; -}; - -&pwm_tacho { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default - &pinctrl_pwm2_default &pinctrl_pwm3_default - &pinctrl_pwm4_default &pinctrl_pwm5_default - &pinctrl_pwm6_default &pinctrl_pwm7_default>; - - fan@0 { - reg = <0x00>; - aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; - }; - fan@1 { - reg = <0x01>; - aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; - }; - fan@2 { - reg = <0x02>; - aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; - }; - fan@3 { - reg = <0x03>; - aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; - }; - fan@4 { - reg = <0x04>; - aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>; - }; - fan@5 { - reg = <0x05>; - aspeed,fan-tach-ch = /bits/ 8 <0x0A 0x0B>; - }; - fan@6 { - reg = <0x06>; - aspeed,fan-tach-ch = /bits/ 8 <0x0C 0x0D>; - }; - fan@7 { - reg = <0x07>; - aspeed,fan-tach-ch = /bits/ 8 <0x0E 0x0F>; - }; - -}; - -&timer { -/* - * Available settings: - * fttmr010,pwm-outputs = <5>, <6>, <7>, <8>; - * pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default - * &pinctrl_timer7_default &pinctrl_timer8_default>; - */ - fttmr010,pwm-outputs = <6>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_timer6_default>; - #pwm-cells = <3>; - status = "okay"; -}; - -&video { - status = "okay"; - memory-region = <&video_engine_memory>; -}; - -&vhub { - status = "okay"; -}; diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi deleted file mode 100644 index db50ad6796..0000000000 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -// 64MB flash layout: - -partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - u-boot@0 { - reg = <0x0 0x60000>; // 384KB - label = "u-boot"; - }; - - u-boot-env@60000 { - reg = <0x60000 0x20000>; // 128KB - label = "u-boot-env"; - }; - - kernel@80000 { - reg = <0x80000 0x880000>; // 8704KB - label = "kernel"; - }; - - rofs@900000 { - reg = <0x900000 0x2700000>; // 39MB - label = "rofs"; - }; - - rwfs@3000000 { - reg = <0x3000000 0x100000>; // 16MB - label = "rwfs"; - }; -}; -- cgit v1.2.3