From nobody Tue Jan 24 22:10:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h3m642rz3bdtn; Tue, 24 Jan 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h3m5VYtz4JQB; Tue, 24 Jan 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NICrJA+YK06bo8ZGEOs+UJKuWyuCg7vVzQx0yAdQ8As=; b=OHjIDvy+urY2Pw7/oRh2PlS2H+6BymHXrXyAOf3tK7bG1zaPu/QuBjX8Bgrw3k80DbcO2/ AoX0UFsFxmqBRCmbgHulzHDe46gjqku88uN+eUKrSGX+OHiGlKi+6FG+ywyzprbLc0Y1hA 7ElZOlBiEb19M5k3zn3xLWwtrlGkkD03vko3HuPiqXUfTxlYO5QzsvAowk6aoK/5779xqZ 1GDjsjGyJHRHNJnFa+Cnhs/yFZ2p8tnC+aXnHbIGylZP1p8D1o+JYkvs4D66HDZvYzBBYP oTpm271I102cSvimgVPLwSxqNp3hnvj18bXN1eOmICtijuJzN/gNYhILG0di/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NICrJA+YK06bo8ZGEOs+UJKuWyuCg7vVzQx0yAdQ8As=; b=h67NgEh+qC4N4rn/1Dlbd2sI/PGPXT06qCuM0XVTWgNOiYDYmN5p22ubYEzO8Fingszy+H X4W0qFlgpcTufhFAmEdvgMOGXJoB+CUN+RC50rvtPqsxI8hCy4AcHPggwQgfDLtSHSzplN oiiZYXpsamGdrgI9vzBssQVVEuU3y1m4O1fVCPRNo1DF/Ssi65nkMvLXF8X9HxQAn9ZnPw lpUPpFA7Rnjaafo9lBbDte3EwILsgGjuF2kJ7jsUhRSML5KUqYA0M0ILb95bs5OdIxWkfj XHkCS3jLYXxUZ9nfFXqtpFTBoUtFM5Qhb92ca6kFitqU043JdP+qzEHlWwy81w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598212; a=rsa-sha256; cv=none; b=dBzE9chLxDph1I49TsQqRYqrpyVGj8JJTD9RybVhdT96d6AvCCHF2SydtvfLxAY9VrT7mx X6p6gi6a9C0dWf9OQ+cO9kIwDxbjwnTpMV+ErOoK7sHpecGYoMVpg3aSoRE1cHIfAE0TOi KlCOd7KAAxt5GvWaLnVZeyCFyFvwSokzbXow+udEju5exn70h2RUkE2VxWi8BJqHn29+Kh x/H72lRS5nYZjk0FL+4pLfszyXSYLo4XU6CuP8Dm5EjWfd3RnPjOqQKmspMfKMGrdyWT2o Uspg4/RD7sjtrCfMAQs5WoRePXVNnFgGEhSrKHcptZnrxBC+XSkeN62jNaMDdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h3m4Z5JzQTB; Tue, 24 Jan 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMACLQ076964; Tue, 24 Jan 2023 22:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMACKa076961; Tue, 24 Jan 2023 22:10:12 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:12 GMT Message-Id: <202301242210.30OMACKa076961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4b3f5dd4d87c - stable/13 - kboot: Split out powerpc build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b3f5dd4d87c28b4ef1c2cff521eb8bb0f450e89 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b3f5dd4d87c28b4ef1c2cff521eb8bb0f450e89 commit 4b3f5dd4d87c28b4ef1c2cff521eb8bb0f450e89 Author: Warner Losh AuthorDate: 2021-12-30 23:07:13 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:19 +0000 kboot: Split out powerpc build Split the powerpc specific parts into kboot/arch/powerpc64. More may be needed here. Sponsored by: Netflix Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D33514 (cherry picked from commit 6497250f6f7f93e36795f5d0ec8ac658f6e781d8) --- stand/Makefile | 2 ++ stand/kboot/Makefile | 17 +++++------------ stand/kboot/arch/powerpc64/Makefile.inc | 14 ++++++++++++++ stand/kboot/{ => arch/powerpc64}/conf.c | 0 stand/kboot/{ => arch/powerpc64}/host_syscall.S | 0 stand/kboot/{ => arch/powerpc64}/kerneltramp.S | 0 stand/kboot/{ => arch/powerpc64}/ldscript.powerpc | 0 stand/kboot/{ => arch/powerpc64}/ppc64_elf_freebsd.c | 0 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/stand/Makefile b/stand/Makefile index 8fd981cd21f1..1597f6832c07 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -80,8 +80,10 @@ SUBDIR_DEPEND_forth+= ficl SUBDIR_DEPEND_lua+= liblua SUBDIR_DEPEND_efi+= ${INTERP_DEPENDS} +SUBDIR_DEPEND_kboot+= ${INTERP_DEPENDS} .if ${MK_FDT} != "no" SUBDIR_DEPEND_efi+= fdt +SUBDIR_DEPEND_kboot+= fdt .endif SUBDIR_DEPEND_uboot+= ${INTERP_DEPENDS} diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index 46bcc3d0e63a..aa5511d915a9 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -17,30 +17,23 @@ NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} INSTALLFLAGS= -b # Architecture-specific loader code -SRCS= conf.c vers.c main.c ppc64_elf_freebsd.c -SRCS+= host_syscall.S hostcons.c hostdisk.c kerneltramp.S kbootfdt.c -SRCS+= ucmpdi2.c gfx_fb_stub.c +SRCS= vers.c main.c hostcons.c hostdisk.c kbootfdt.c gfx_fb_stub.c CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken .include "${BOOTSRC}/fdt.mk" -CFLAGS+= -mcpu=powerpc64 +.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} +.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" # Always add MI sources .include "${BOOTSRC}/loader.mk" .PATH: ${SYSDIR}/libkern +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} -CFLAGS+= -Wall -DAIM -# load address. set in linker script -RELOC?= 0x0 -CFLAGS+= -DRELOC=${RELOC} - -LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc +CFLAGS+= -Wall DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} -MK_PIE= no - .include diff --git a/stand/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/arch/powerpc64/Makefile.inc new file mode 100644 index 000000000000..3c2fb6e18a16 --- /dev/null +++ b/stand/kboot/arch/powerpc64/Makefile.inc @@ -0,0 +1,14 @@ +CFLAGS+= -mcpu=powerpc64 + +SRCS+= conf.c ppc64_elf_freebsd.c host_syscall.S kerneltramp.S +SRCS+= ucmpdi2.c + +# load address. set in linker script +RELOC?= 0x0 +CFLAGS+= -DRELOC=${RELOC} + +LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc + +MK_PIE= no +# Maybe bogus? +CFLAGS+= -DAIM diff --git a/stand/kboot/conf.c b/stand/kboot/arch/powerpc64/conf.c similarity index 100% rename from stand/kboot/conf.c rename to stand/kboot/arch/powerpc64/conf.c diff --git a/stand/kboot/host_syscall.S b/stand/kboot/arch/powerpc64/host_syscall.S similarity index 100% rename from stand/kboot/host_syscall.S rename to stand/kboot/arch/powerpc64/host_syscall.S diff --git a/stand/kboot/kerneltramp.S b/stand/kboot/arch/powerpc64/kerneltramp.S similarity index 100% rename from stand/kboot/kerneltramp.S rename to stand/kboot/arch/powerpc64/kerneltramp.S diff --git a/stand/kboot/ldscript.powerpc b/stand/kboot/arch/powerpc64/ldscript.powerpc similarity index 100% rename from stand/kboot/ldscript.powerpc rename to stand/kboot/arch/powerpc64/ldscript.powerpc diff --git a/stand/kboot/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c similarity index 100% rename from stand/kboot/ppc64_elf_freebsd.c rename to stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c