bump dependencies

go.mod

@@ -1,13 +1,13 @@
 module github.com/usbarmory/armory-ums
 
-go 1.18
+go 1.19
 
 require (
-	github.com/usbarmory/tamago v0.0.0-20220714104148-d5b7c14a0fbb
+	github.com/usbarmory/tamago v0.0.0-20220823080407-04f05cf2a5a3
 )
 
 require (
-	github.com/usbarmory/crucible v0.0.0-20220714120504-72486669d880 // indirect
+	github.com/usbarmory/crucible v0.0.0-20220823085715-c9e97b45a8b2 // indirect
 	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
-	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
 )

go.sum

@@ -1,8 +1,8 @@
-github.com/usbarmory/crucible v0.0.0-20220714120504-72486669d880 h1:ogyDoUb9ZDxH/0MDP/duSnRkf+U6+QvLBTg30bcIIU4=
-github.com/usbarmory/crucible v0.0.0-20220714120504-72486669d880/go.mod h1:FY45ll2dddCy+oXYXTlFe0QVhUQCvHAAXTqlArwzDWw=
-github.com/usbarmory/tamago v0.0.0-20220714104148-d5b7c14a0fbb h1:hMUTOoMrjgbP/Yjvy3SAyHFZ+W3v1cQTrvO09R1cqa8=
-github.com/usbarmory/tamago v0.0.0-20220714104148-d5b7c14a0fbb/go.mod h1:Lok79mjbJnhoBGqhX5cCUsZtSemsQF5FNZW+2R1dRr8=
+github.com/usbarmory/crucible v0.0.0-20220823085715-c9e97b45a8b2 h1:dxJotkRF+Ns8mRgp5BQh5j2l6xwcfTWlMd7Xge3qv3Y=
+github.com/usbarmory/crucible v0.0.0-20220823085715-c9e97b45a8b2/go.mod h1:/tDFfTW0y+CtcKzAPmIREQIDpzCuOmLpN8UxHh/iMls=
+github.com/usbarmory/tamago v0.0.0-20220823080407-04f05cf2a5a3 h1:OgWngXmohy/sxTnHm7uStq0YlMkH0J+JY2HnBCv6fn0=
+github.com/usbarmory/tamago v0.0.0-20220823080407-04f05cf2a5a3/go.mod h1:Lok79mjbJnhoBGqhX5cCUsZtSemsQF5FNZW+2R1dRr8=
 go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
 go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

main.go

@@ -12,9 +12,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/usbarmory/tamago/soc/imx6"
-	"github.com/usbarmory/tamago/soc/imx6/usb"
-	"github.com/usbarmory/tamago/soc/imx6/usdhc"
+	"github.com/usbarmory/tamago/soc/nxp/imx6ul"
+	"github.com/usbarmory/tamago/soc/nxp/usb"
+	"github.com/usbarmory/tamago/soc/nxp/usdhc"
 
 	usbarmory "github.com/usbarmory/tamago/board/usbarmory/mk2"
 )
@@ -24,7 +24,7 @@ var cards []*usdhc.USDHC
 func init() {
 	log.SetFlags(0)
 
-	if err := imx6.SetARMFreq(900); err != nil {
+	if err := imx6ul.SetARMFreq(900); err != nil {
 		panic(fmt.Sprintf("WARNING: error setting ARM frequency: %v\n", err))
 	}
 }

scsi.go

@@ -14,8 +14,8 @@ import (
 	"fmt"
 
 	"github.com/usbarmory/tamago/dma"
-	"github.com/usbarmory/tamago/soc/imx6/usb"
-	"github.com/usbarmory/tamago/soc/imx6/usdhc"
+	"github.com/usbarmory/tamago/soc/nxp/usb"
+	"github.com/usbarmory/tamago/soc/nxp/usdhc"
 )
 
 const (

usb.go

@@ -17,8 +17,8 @@ import (
 	"strings"
 
 	"github.com/usbarmory/tamago/dma"
-	"github.com/usbarmory/tamago/soc/imx6"
-	"github.com/usbarmory/tamago/soc/imx6/usb"
+	"github.com/usbarmory/tamago/soc/nxp/imx6ul"
+	"github.com/usbarmory/tamago/soc/nxp/usb"
 )
 
 const maxPacketSize = 512
@@ -53,7 +53,7 @@ func configureDevice(device *usb.Device) {
 	//
 	// The serial number format is [0-9A-F]{12,}, the NXP Unique
 	// ID is converted accordingly.
-	uid := imx6.UniqueID()
+	uid := imx6ul.UniqueID()
 	serial := strings.ToUpper(hex.EncodeToString(uid[:]))
 
 	iSerial, _ := device.AddString(serial)