November 2023 - U-Boot

[PATCH] bootstd: Skip over bad device during bootflows scanning
by Tony Dinh 01 Nov '23

01 Nov '23

During scanning for the next bootdev, if bootdev_next_prio() encounters a device error (e.g. ENOSYS), let it continue scanning the next devices, not stopping prematurely. Background: During scanning for bootflows, it's possible for bootstd to encounter a faulty device controller. Also when the same u-boot is used for another variant of the same board, some device controller such as SATA might not exist. I've found this issue while converting the Marvell Sheevaplug board to use bootstd. This board has 2 variants, the original Sheevaplug has MMC and USB only, but the later variant comes with USB, MMC, and eSATA ports. We have been using the same u-boot (starting with CONFIG_IDE and later with DM CONFIG_SATA) for both variants. This worked well with the old envs-scripting booting scheme. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- boot/bootdev-uclass.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 44ae98a926..b1d48e5b69 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -677,8 +677,6 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp) BOOTFLOWIF_SHOW); log_debug("- bootdev_hunt_prio() ret %d\n", ret); - if (ret) - return log_msg_ret("hun", ret); } } else { ret = device_probe(dev); -- 2.39.2

2 4

[PATCH v1] clk: mux: check value returned from clk_mux_val_to_index()
by Maksim Kiselev 01 Nov '23

01 Nov '23

The clk_mux_val_to_index() may return -EINVAL. In this case clk_mux_get_parent() will return a wrong parent index and this will lead to out of bounds error. E.g. when we register mux clk: ret = clk_register(clk, UBOOT_DM_CLK_CCF_MUX, name, parent_names[clk_mux_get_parent(clk)]); Let's add a check on the return value of clk_mux_val_to_index() and if it's negative, set parent index to 0. Signed-off-by: Maksim Kiselev <bigunclemax(a)gmail.com> --- drivers/clk/clk-mux.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 017f25f7a5..00fe916171 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -88,6 +88,7 @@ unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index) u8 clk_mux_get_parent(struct clk *clk) { struct clk_mux *mux = to_clk_mux(clk); + int index; u32 val; #if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) @@ -98,7 +99,13 @@ u8 clk_mux_get_parent(struct clk *clk) val >>= mux->shift; val &= mux->mask; - return clk_mux_val_to_index(clk, mux->table, mux->flags, val); + index = clk_mux_val_to_index(clk, mux->table, mux->flags, val); + if (index < 0) { + log_err("Could not fetch index\n"); + index = 0; + } + + return index; } static int clk_fetch_parent_index(struct clk *clk, -- 2.39.2

2 1

[PATCH] clk: change log_err() to log_info() to make it quiet with clk_register_fixed_rate()
by notfound405 01 Nov '23

01 Nov '23

clk_register_fixed_rate() calls clk_register() with the fourth argument(parent_name) being NULL, making it output error message. Change to log_info() to fix it. Signed-off-by: Yang Xiwen <forbidden405(a)foxmail.com> --- The previous email is signed with a wrong name. The patch is not modified. drivers/clk/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a5a3461b66..0619937cee 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -24,7 +24,7 @@ int clk_register(struct clk *clk, const char *drv_name, ret = uclass_get_device_by_name(UCLASS_CLK, parent_name, &parent); if (ret) { - log_err("%s: failed to get %s device (parent of %s)\n", + log_info("%s: failed to get %s device (parent of %s)\n", __func__, parent_name, name); } else { log_debug("%s: name: %s parent: %s [0x%p]\n", __func__, name, -- 2.39.2

2 1

[PATCH v1] clk: nuvoton: add read only feature for clk driver
by Jim Liu 01 Nov '23

01 Nov '23

Set ahb/apb/fiu clock divider as read-only Signed-off-by: Jim Liu <JJLIU0(a)nuvoton.com> --- drivers/clk/nuvoton/clk_npcm.c | 15 ++++++++++++--- drivers/clk/nuvoton/clk_npcm.h | 1 + drivers/clk/nuvoton/clk_npcm8xx.c | 12 ++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/clk/nuvoton/clk_npcm.c b/drivers/clk/nuvoton/clk_npcm.c index 8d71f2a24b..18cb9cddbf 100644 --- a/drivers/clk/nuvoton/clk_npcm.c +++ b/drivers/clk/nuvoton/clk_npcm.c @@ -135,7 +135,7 @@ static u32 npcm_clk_get_div(struct clk *clk) return div; } -static u32 npcm_clk_set_div(struct clk *clk, u32 div) +static int npcm_clk_set_div(struct clk *clk, u32 div) { struct npcm_clk_priv *priv = dev_get_priv(clk->dev); struct npcm_clk_div *divider; @@ -145,6 +145,9 @@ static u32 npcm_clk_set_div(struct clk *clk, u32 div) if (!divider) return -EINVAL; + if (divider->flags & DIV_RO) + return 0; + if (divider->flags & PRE_DIV2) div = div >> 1; @@ -153,6 +156,12 @@ static u32 npcm_clk_set_div(struct clk *clk, u32 div) else clkdiv = ilog2(div); + if (clkdiv > (divider->mask >> (ffs(divider->mask) - 1))) { + printf("clkdiv(%d) for clk(%ld) is over limit\n", + clkdiv, clk->id); + return -EINVAL; + } + val = readl(priv->base + divider->reg); val &= ~divider->mask; val |= (clkdiv << (ffs(divider->mask) - 1)) & divider->mask; @@ -253,8 +262,8 @@ static ulong npcm_clk_set_rate(struct clk *clk, ulong rate) if (ret) return ret; - debug("%s: rate %lu, new rate (%lu / %u)\n", __func__, rate, parent_rate, div); - return (parent_rate / div); + debug("%s: rate %lu, new rate %lu\n", __func__, rate, npcm_clk_get_rate(clk)); + return npcm_clk_get_rate(clk); } static int npcm_clk_set_parent(struct clk *clk, struct clk *parent) diff --git a/drivers/clk/nuvoton/clk_npcm.h b/drivers/clk/nuvoton/clk_npcm.h index 06b60dc8b8..b4726d8381 100644 --- a/drivers/clk/nuvoton/clk_npcm.h +++ b/drivers/clk/nuvoton/clk_npcm.h @@ -50,6 +50,7 @@ #define PRE_DIV2 BIT(2) /* Pre divisor = 2 */ #define POST_DIV2 BIT(3) /* Post divisor = 2 */ #define FIXED_PARENT BIT(4) /* clock source is fixed */ +#define DIV_RO BIT(5) /* divider is read-only */ /* Parameters of PLL configuration */ struct npcm_clk_pll { diff --git a/drivers/clk/nuvoton/clk_npcm8xx.c b/drivers/clk/nuvoton/clk_npcm8xx.c index 27e3cfcf55..d1b32e3237 100644 --- a/drivers/clk/nuvoton/clk_npcm8xx.c +++ b/drivers/clk/nuvoton/clk_npcm8xx.c @@ -45,12 +45,12 @@ static struct npcm_clk_select npcm8xx_clk_selectors[] = { }; static struct npcm_clk_div npcm8xx_clk_dividers[] = { - {NPCM8XX_CLK_AHB, CLKDIV1, CLK4DIV, DIV_TYPE1 | PRE_DIV2}, - {NPCM8XX_CLK_APB2, CLKDIV2, APB2CKDIV, DIV_TYPE2}, - {NPCM8XX_CLK_APB5, CLKDIV2, APB5CKDIV, DIV_TYPE2}, - {NPCM8XX_CLK_SPI0, CLKDIV3, SPI0CKDIV, DIV_TYPE1}, - {NPCM8XX_CLK_SPI1, CLKDIV3, SPI1CKDIV, DIV_TYPE1}, - {NPCM8XX_CLK_SPI3, CLKDIV1, SPI3CKDIV, DIV_TYPE1}, + {NPCM8XX_CLK_AHB, CLKDIV1, CLK4DIV, DIV_TYPE1 | PRE_DIV2 | DIV_RO}, + {NPCM8XX_CLK_APB2, CLKDIV2, APB2CKDIV, DIV_TYPE2 | DIV_RO}, + {NPCM8XX_CLK_APB5, CLKDIV2, APB5CKDIV, DIV_TYPE2 | DIV_RO}, + {NPCM8XX_CLK_SPI0, CLKDIV3, SPI0CKDIV, DIV_TYPE1 | DIV_RO}, + {NPCM8XX_CLK_SPI1, CLKDIV3, SPI1CKDIV, DIV_TYPE1 | DIV_RO}, + {NPCM8XX_CLK_SPI3, CLKDIV1, SPI3CKDIV, DIV_TYPE1 | DIV_RO}, {NPCM8XX_CLK_SPIX, CLKDIV3, SPIXCKDIV, DIV_TYPE1}, {NPCM8XX_CLK_UART, CLKDIV1, UARTDIV1, DIV_TYPE1}, {NPCM8XX_CLK_UART2, CLKDIV3, UARTDIV2, DIV_TYPE1}, -- 2.17.1

2 3

[PATCH v4 0/8] clk: Switch from soc_clk_dump to clk_ops function
by Igor Prusov 01 Nov '23

01 Nov '23

Currently clock providers may override default implementation of soc_clk_dump function to replace clk dump command output. This causes confusing behaviour when u-boot is built with one of such drivers enabled but still has clocks defined using CCF. For example, enabling CMD_CLK and using clk dump on sandbox target will not show CCF clocks because k210 driver overrides common soc_clk_dump. Changelog: v1 -> v2: - Add missing static to dump functions v2 -> v3: - Make soc_clk_dump in cmd/clk.c static instead of removing __weak v3 -> v4: - Rebase and refactor dump for new Amlogic A1 clock controller driver Igor Prusov (8): clk: zynq: Move soc_clk_dump to Zynq clock driver clk: ast2600: Move soc_clk_dump function clk: k210: Move soc_clk_dump function clk: amlogic: Move driver and ops structs clk: Add dump operation to clk_ops cmd: clk: Use dump function from clk_ops clk: treewide: switch to clock dump from clk_ops cmd: clk: Make soc_clk_dump static arch/arm/mach-zynq/clk.c | 57 -------------- arch/mips/mach-pic32/cpu.c | 23 ------ cmd/clk.c | 13 +++- drivers/clk/aspeed/clk_ast2600.c | 83 ++++++++++---------- drivers/clk/clk_k210.c | 103 ++++++++++++------------- drivers/clk/clk_pic32.c | 39 ++++++++++ drivers/clk/clk_versal.c | 7 +- drivers/clk/clk_zynq.c | 51 ++++++++++++ drivers/clk/clk_zynqmp.c | 13 ++-- drivers/clk/imx/clk-imx8.c | 11 +-- drivers/clk/meson/a1.c | 54 +++++-------- drivers/clk/mvebu/armada-37xx-periph.c | 5 +- drivers/clk/stm32/clk-stm32mp1.c | 29 ++----- include/clk-uclass.h | 3 + include/clk.h | 2 - 15 files changed, 244 insertions(+), 249 deletions(-) -- 2.34.1

3 14

[PATCH v2 0/4] Add AM62x LP SK support
by Nitin Yadav 01 Nov '23

01 Nov '23

This series adds support of AM62x LP SK. The AM62x LP SK board is similar to AM62x SK but has some significant changes that requires different set of device tree at each stage of bootloader. Also refactors to have common nodes at k3-am62x-r5-sk-common.dtsi and k3-am62x-sk-common-u-boot.dtsi for all am62x SoC varients. Change Log: V1 -> V2: - Added deltas for board documentation. - Updated commit messgae to include board schematics. - Replace 'bootph-pre-ram' from 'bootph-all' in u-boot.dtsi - Removed memory node from k3-am62-r5-lp-sk.dts - Updated DDR part on k3-am62x-ddr-lp4-50-800-800.dtsi - Squashed binman.dtsi into k3-am62-lp-sk-u-boot.dtsi - Removed am62xlpsk.env environment, for now using am62.env V1: https://lore.kernel.org/all/20230927082105.3729470-1-n-yadav@ti.com/ Nitin Yadav (4): arm: dts: Refactor common dtsi file for R5 and A53 SPL arm: dts: Add support for AM62x LP SK board: ti: am62x: add am62x_lpsk_*_defconfigs fragments doc: ti: Add AM62x LP SK Board information arch/arm/dts/Makefile | 2 + arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 32 + arch/arm/dts/k3-am62-lp-sk.dts | 231 ++ arch/arm/dts/k3-am62-r5-lp-sk.dts | 12 + arch/arm/dts/k3-am625-r5-sk.dts | 94 +- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 110 +- arch/arm/dts/k3-am62x-ddr-lp4-50-800-800.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am62x-r5-sk-common.dtsi | 96 + arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi | 109 + board/ti/am62x/am62x_lpsk_a53.config | 5 + board/ti/am62x/am62x_lpsk_r5.config | 5 + doc/board/ti/am62x_sk.rst | 8 + 12 files changed, 2696 insertions(+), 198 deletions(-) create mode 100644 arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi create mode 100644 arch/arm/dts/k3-am62-lp-sk.dts create mode 100644 arch/arm/dts/k3-am62-r5-lp-sk.dts create mode 100644 arch/arm/dts/k3-am62x-ddr-lp4-50-800-800.dtsi create mode 100644 arch/arm/dts/k3-am62x-r5-sk-common.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi create mode 100644 board/ti/am62x/am62x_lpsk_a53.config create mode 100644 board/ti/am62x/am62x_lpsk_r5.config -- 2.25.1

3 11

[PATCH] doc: ti: j7200_evm: Fix OPTEE platform name
by Nishanth Menon 01 Nov '23

01 Nov '23

k3-j7200 does not exist in upstream OPTEE. Use j721e as the platform name. Using k3-j7200 as OPTEE name results in broken boot due to wrong configuration being picked. Fixes: c727b81d6530 ("doc: board: ti: k3: Reuse build instructions") Signed-off-by: Nishanth Menon <nm(a)ti.com> --- Cc: Reid Tonking <reidt(a)ti.com> Cc: Udit Kumar <u-kumar1(a)ti.com> Cc: Manorit Chawdhry <m-chawdhry(a)ti.com> Cc: Andrew Davis <afd(a)ti.com> Cc: Neha Malcom Francis <n-francis(a)ti.com> Cc: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Logs: https://gist.github.com/nmenon/0b05a556ce8ff91ec070c7c0c0fb62f3 (before and after) doc/board/ti/j7200_evm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/board/ti/j7200_evm.rst b/doc/board/ti/j7200_evm.rst index bcf8dc1c5f0d..35b554166e45 100644 --- a/doc/board/ti/j7200_evm.rst +++ b/doc/board/ti/j7200_evm.rst @@ -71,7 +71,7 @@ Set the variables corresponding to this platform: $ export TFA_BOARD=generic $ # we dont use any extra TFA parameters $ unset TFA_EXTRA_ARGS - $ export OPTEE_PLATFORM=k3-j7200 + $ export OPTEE_PLATFORM=k3-j721e $ # we dont use any extra OP-TEE parameters $ unset OPTEE_EXTRA_ARGS -- 2.40.0

1 0

[GIT PULL] Please pull u-boot-mmc master
by Jaehoon Chung 01 Nov '23

01 Nov '23

Dear Tom, Please pull u-boot-mmc master into u-boot master branch. If there is any problem, let me know, plz. Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/18386 The following changes since commit 62fc66b6d228d628c3f672c736aa57e4174ac783: Merge branch '2023-10-31-platform-updates' (2023-10-31 13:08:10 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-mmc.git master for you to fetch changes up to b5f403936d037e0bc08e78b8af64adf53da13b90: cmd: mmc: Add mmc reg read command for reading card registers (2023-11-01 10:09:21 +0900) ---------------------------------------------------------------- Bin Meng (1): mmc: pci: Drop the superfluous cast Marek Vasut (1): cmd: mmc: Add mmc reg read command for reading card registers Oleksandr Suvorov (1): mmc: spl: select SPL_BLK for SPL_DM_MMC Sean Anderson (1): mmc: sdhci: Rework SDHCI_QUIRK_BROKEN_R1B cmd/Kconfig | 7 ++++ cmd/mmc.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/usage/cmd/mmc.rst | 26 ++++++++++++++ drivers/mmc/Kconfig | 1 + drivers/mmc/pci_mmc.c | 4 +-- drivers/mmc/sdhci.c | 19 ++++++---- include/sdhci.h | 1 + 7 files changed, 145 insertions(+), 9 deletions(-)

2 1

[PATCH v1] rng: add dm_rng_read_default() helper
by Alexey Romanov 01 Nov '23

01 Nov '23

Add dm_rng_read_default() function, which obtain a series of random bytes. In some cases, such function would be useful because it allows the caller to abstract away from RNG device. Signed-off-by: Alexey Romanov <avromanov(a)salutedevices.com> --- drivers/rng/rng-uclass.c | 20 ++++++++++++++++++++ include/rng.h | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c index 53108e1b31..3a8fb7d276 100644 --- a/drivers/rng/rng-uclass.c +++ b/drivers/rng/rng-uclass.c @@ -19,6 +19,26 @@ int dm_rng_read(struct udevice *dev, void *buffer, size_t size) return ops->read(dev, buffer, size); } +int dm_rng_read_default(void *buffer, size_t size) +{ + struct udevice *rng; + int ret; + + ret = uclass_get_device(UCLASS_RNG, 0, &rng); + if (ret) { + pr_err("Can't get RNG device (%d)\n", ret); + return ret; + } + + ret = dm_rng_read(rng, buffer, size); + if (ret) { + pr_err("Can't read from RNG device (%d)\n", ret); + return ret; + } + + return 0; +} + UCLASS_DRIVER(rng) = { .name = "rng", .id = UCLASS_RNG, diff --git a/include/rng.h b/include/rng.h index 37af554363..5537daae88 100644 --- a/include/rng.h +++ b/include/rng.h @@ -20,6 +20,16 @@ struct udevice; */ int dm_rng_read(struct udevice *dev, void *buffer, size_t size); +/** + * dm_rng_read_default() - same as dm_rng_read(), except that caller + * don't need to pass an argument with RNG udevice. + * @buffer: input buffer to put the read random seed into + * @size: number of bytes of random seed read + * + * Return: 0 if OK, -ve on error + */ +int dm_rng_read_default(void *buffer, size_t size); + /** * struct dm_rng_ops - operations for the hwrng uclass * -- 2.25.1

2 1

[PATCH v4 1/1] arm: dts: icnova-a20-adb4006: Add board support
by Ludwig Kormann 01 Nov '23

01 Nov '23

Add board support for ICnova A20 SomPi compute module on ICnova ADB4006 development board. Specification: SoM - Processor: Allwinner A20 Cortex-A7 Dual Core at 1GHz - 512MB DDR3 RAM - Fast Ethernet (Phy: Realtek RTL8201CP) ADB4006 - I2C - 2x USB 2.0 - 1x Fast Ethernet port - 1x SATA - 2x buttons (PWRON, Boot) - 2x LEDS - serial console - HDMI - µSD-Card slot - Audio Line-In / Line-Out - GPIO pinheaders https://wiki.in-circuit.de/index.php5?title=ICnova_ADB4006 https://wiki.in-circuit.de/index.php5?title=ICnova_A20_SODIMM devicetree upstreamed with linux 6.5 Signed-off-by: Ludwig Kormann <ludwig.kormann(a)ict42.de> --- changes in v4: - rebase on master - add CONFIG_SYS_64BIT_LBA - drop dts from patch, already upstreamed changes in v3: - rebase on v2023.10 changes in v2: - rebase on v2023.07-rc2 - remove pin defines from defconfig - get dts reviewed on the linux mailing list and scheduled for kernel 6.5 [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git commit de2bdfb7f79d5c655eb056d459e02be2c7f13c8b --- arch/arm/dts/Makefile | 1 + board/sunxi/MAINTAINERS | 5 +++++ configs/icnova-a20-adb4006_defconfig | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 configs/icnova-a20-adb4006_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 55aceb51cd..d947b8de56 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -693,6 +693,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-haoyu-marsboard.dtb \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-icnova-a20-adb4006.dtb \ sun7i-a20-icnova-swac.dtb \ sun7i-a20-itead-ibox.dtb \ sun7i-a20-lamobo-r1.dtb \ diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 4bbe3f62fa..0061437211 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -236,6 +236,11 @@ M: Stefan Roese <sr(a)denx.de> S: Maintained F: configs/icnova-a20-swac_defconfig +ICnova-A20-ADB4006 BOARD +M: Ludwig Kormann <ludwig.kormann(a)ict42.de> +S: Maintained +F: configs/icnova-a20-adb4006_defconfig + ITEAD IBOX BOARD M: Marcus Cooper <codekipper(a)gmail.com> S: Maintained diff --git a/configs/icnova-a20-adb4006_defconfig b/configs/icnova-a20-adb4006_defconfig new file mode 100644 index 0000000000..22cbb612e3 --- /dev/null +++ b/configs/icnova-a20-adb4006_defconfig @@ -0,0 +1,21 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-adb4006" +CONFIG_SPL=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL_I2C=y +CONFIG_SCSI_AHCI=y +CONFIG_SYS_64BIT_LBA=y +CONFIG_SYS_I2C_MVTWSI=y +CONFIG_SYS_I2C_SLAVE=0x7f +CONFIG_SYS_I2C_SPEED=400000 +CONFIG_ETH_DESIGNWARE=y +CONFIG_MII=y +CONFIG_SUN7I_GMAC=y +CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y -- 2.30.2

2 1